@@ -370,7 +370,7 @@ management_callback_remote_cmd(void *arg, const char **p)

         && ((ce->flags >> CE_MAN_QUERY_REMOTE_SHIFT) & CE_MAN_QUERY_REMOTE_MASK)

                == CE_MAN_QUERY_REMOTE_QUERY)

     {

-        int flags = 0;

+        unsigned int flags = 0;

         if (!strcmp(p[1], "ACCEPT"))

         {

             flags = CE_MAN_QUERY_REMOTE_ACCEPT;

@@ -24,24 +24,24 @@

 #define MANAGE_H

 /* management_open flags */

-#define MF_SERVER                 (1 << 0)

-#define MF_QUERY_PASSWORDS        (1 << 1)

-#define MF_HOLD                   (1 << 2)

-#define MF_SIGNAL                 (1 << 3)

-#define MF_FORGET_DISCONNECT      (1 << 4)

-#define MF_CONNECT_AS_CLIENT      (1 << 5)

-#define MF_CLIENT_AUTH            (1 << 6)

-/* #define MF_CLIENT_PF         (1<<7) *REMOVED FEATURE* */

-#define MF_UNIX_SOCK              (1 << 8)

-#define MF_EXTERNAL_KEY           (1 << 9)

-#define MF_EXTERNAL_KEY_NOPADDING (1 << 10)

-#define MF_EXTERNAL_KEY_PKCS1PAD  (1 << 11)

-#define MF_UP_DOWN                (1 << 12)

-#define MF_QUERY_REMOTE           (1 << 13)

-#define MF_QUERY_PROXY            (1 << 14)

-#define MF_EXTERNAL_CERT          (1 << 15)

-#define MF_EXTERNAL_KEY_PSSPAD    (1 << 16)

-#define MF_EXTERNAL_KEY_DIGEST    (1 << 17)

+#define MF_SERVER                 (1u << 0)

+#define MF_QUERY_PASSWORDS        (1u << 1)

+#define MF_HOLD                   (1u << 2)

+#define MF_SIGNAL                 (1u << 3)

+#define MF_FORGET_DISCONNECT      (1u << 4)

+#define MF_CONNECT_AS_CLIENT      (1u << 5)

+#define MF_CLIENT_AUTH            (1u << 6)

+/* #define MF_CLIENT_PF              (1u << 7) *REMOVED FEATURE* */

+#define MF_UNIX_SOCK              (1u << 8)

+#define MF_EXTERNAL_KEY           (1u << 9)

+#define MF_EXTERNAL_KEY_NOPADDING (1u << 10)

+#define MF_EXTERNAL_KEY_PKCS1PAD  (1u << 11)

+#define MF_UP_DOWN                (1u << 12)

+#define MF_QUERY_REMOTE           (1u << 13)

+#define MF_QUERY_PROXY            (1u << 14)

+#define MF_EXTERNAL_CERT          (1u << 15)

+#define MF_EXTERNAL_KEY_PSSPAD    (1u << 16)

+#define MF_EXTERNAL_KEY_DIGEST    (1u << 17)

 #ifdef ENABLE_MANAGEMENT

@@ -64,9 +64,9 @@ struct man_def_auth_context

 {

     unsigned long cid;

-#define DAF_CONNECTION_ESTABLISHED (1 << 0)

-#define DAF_CONNECTION_CLOSED      (1 << 1)

-#define DAF_INITIAL_AUTH           (1 << 2)

+#define DAF_CONNECTION_ESTABLISHED (1u << 0)

+#define DAF_CONNECTION_CLOSED      (1u << 1)

+#define DAF_INITIAL_AUTH           (1u << 2)

     unsigned int flags;

     unsigned int mda_key_id_counter;

@@ -117,23 +117,23 @@ struct log_entry

     union log_entry_union u;

 };

-#define LOG_PRINT_LOG_PREFIX   (1 << 0)

-#define LOG_PRINT_ECHO_PREFIX  (1 << 1)

-#define LOG_PRINT_STATE_PREFIX (1 << 2)

+#define LOG_PRINT_LOG_PREFIX   (1u << 0)

+#define LOG_PRINT_ECHO_PREFIX  (1u << 1)

+#define LOG_PRINT_STATE_PREFIX (1u << 2)

-#define LOG_PRINT_INT_DATE  (1 << 3)

-#define LOG_PRINT_MSG_FLAGS (1 << 4)

-#define LOG_PRINT_STATE     (1 << 5)

-#define LOG_PRINT_LOCAL_IP  (1 << 6)

+#define LOG_PRINT_INT_DATE  (1u << 3)

+#define LOG_PRINT_MSG_FLAGS (1u << 4)

+#define LOG_PRINT_STATE     (1u << 5)

+#define LOG_PRINT_LOCAL_IP  (1u << 6)

-#define LOG_PRINT_CRLF   (1 << 7)

-#define LOG_FATAL_NOTIFY (1 << 8)

+#define LOG_PRINT_CRLF   (1u << 7)

+#define LOG_FATAL_NOTIFY (1u << 8)

-#define LOG_PRINT_INTVAL (1 << 9)

+#define LOG_PRINT_INTVAL (1u << 9)

-#define LOG_PRINT_REMOTE_IP (1 << 10)

+#define LOG_PRINT_REMOTE_IP (1u << 10)

-#define LOG_ECHO_TO_LOG (1 << 11)

+#define LOG_ECHO_TO_LOG (1u << 11)

 const char *log_entry_print(const struct log_entry *e, unsigned int flags, struct gc_arena *gc);

@@ -175,7 +175,7 @@ struct management_callback

 {

     void *arg;

-#define MCF_SERVER (1 << 0) /* is OpenVPN being run as a server? */

+#define MCF_SERVER (1u << 0) /* is OpenVPN being run as a server? */

     unsigned int flags;

     void (*status)(void *arg, const int version, struct status_output *so);

@@ -253,9 +253,9 @@ struct man_settings

     int client_gid;

 /* flags for handling the management interface "signal" command */

-#define MANSIG_IGNORE_USR1_HUP  (1 << 0)

-#define MANSIG_MAP_USR1_TO_HUP  (1 << 1)

-#define MANSIG_MAP_USR1_TO_TERM (1 << 2)

+#define MANSIG_IGNORE_USR1_HUP  (1u << 0)

+#define MANSIG_MAP_USR1_TO_HUP  (1u << 1)

+#define MANSIG_MAP_USR1_TO_TERM (1u << 2)

     unsigned int mansig;

 };

@@ -147,14 +147,14 @@ struct connection_entry

     int explicit_exit_notification; /* Explicitly tell peer when we are exiting via OCC_EXIT or

                                        [RESTART] message */

-#define CE_DISABLED                (1 << 0)

-#define CE_MAN_QUERY_PROXY         (1 << 1)

+#define CE_DISABLED                (1u << 0)

+#define CE_MAN_QUERY_PROXY         (1u << 1)

 #define CE_MAN_QUERY_REMOTE_UNDEF  0

 #define CE_MAN_QUERY_REMOTE_QUERY  1

 #define CE_MAN_QUERY_REMOTE_ACCEPT 2

 #define CE_MAN_QUERY_REMOTE_MOD    3

 #define CE_MAN_QUERY_REMOTE_SKIP   4

-#define CE_MAN_QUERY_REMOTE_MASK   (0x07)

+#define CE_MAN_QUERY_REMOTE_MASK   (0x07u)

 #define CE_MAN_QUERY_REMOTE_SHIFT  (2)

     unsigned int flags;