Split MODE_* defines into primary and flags.

diff --git a/sudo.h b/sudo.h
index 272f169a89a91f94ae2c8a5996ddf27f5bf620f8..4726a03a76d39a9b0b034e6fdd192ec006dc02d8 100644 (file)
--- a/sudo.h
+++ b/sudo.h
@@ -97,24 +97,27 @@ struct sudo_user {
 /*
  * Various modes sudo can be in (based on arguments) in hex
  */
-#define MODE_RUN               0x00001
-#define MODE_EDIT              0x00002
-#define MODE_VALIDATE          0x00004
-#define MODE_INVALIDATE                0x00008
-#define MODE_KILL              0x00010
-#define MODE_VERSION           0x00020
-#define MODE_HELP              0x00040
-#define MODE_LIST              0x00080
-#define MODE_CHECK             0x00100
-#define MODE_LISTDEFS          0x00200
-#define MODE_BACKGROUND                0x00400
-#define MODE_SHELL             0x00800
-#define MODE_LOGIN_SHELL       0x01000
-#define MODE_IMPLIED_SHELL     0x02000
-#define MODE_RESET_HOME                0x04000
-#define MODE_PRESERVE_GROUPS   0x08000
-#define MODE_PRESERVE_ENV      0x10000
-#define MODE_NONINTERACTIVE    0x20000
+#define MODE_RUN               0x00000001
+#define MODE_EDIT              0x00000002
+#define MODE_VALIDATE          0x00000004
+#define MODE_INVALIDATE                0x00000008
+#define MODE_KILL              0x00000010
+#define MODE_VERSION           0x00000020
+#define MODE_HELP              0x00000040
+#define MODE_LIST              0x00000080
+#define MODE_CHECK             0x00000100
+#define MODE_LISTDEFS          0x00000200
+#define MODE_MASK              0x0000ffff
+
+/* Mode flags */
+#define MODE_BACKGROUND                0x00010000
+#define MODE_SHELL             0x00020000
+#define MODE_LOGIN_SHELL       0x00040000
+#define MODE_IMPLIED_SHELL     0x00080000
+#define MODE_RESET_HOME                0x00100000
+#define MODE_PRESERVE_GROUPS   0x00200000
+#define MODE_PRESERVE_ENV      0x00400000
+#define MODE_NONINTERACTIVE    0x00800000
 
 /*
  * Used with set_perms()