Move the environment defaults to the end and shorten a few of the descriptions.

diff --git a/def_data.c b/def_data.c
index d95ba3cef07a93bcb206360e6132d6f2df1c5e37..2643ba49e4bb1ac580d1827fcf54040c6a617c9e 100644 (file)
--- a/def_data.c
+++ b/def_data.c
@@ -61,7 +61,7 @@ struct sudo_defs_types sudo_defs_table[] = {
        def_data_lecture,
     }, {
        "lecture_file", T_STR|T_PATH|T_BOOL,
-       "Path to a file containing the sudo lecture: %s",
+       "File containing the sudo lecture: %s",
     }, {
        "authenticate", T_FLAG,
        "Require users to authenticate by default",
@@ -173,15 +173,6 @@ struct sudo_defs_types sudo_defs_table[] = {
     }, {
        "editor", T_STR|T_PATH,
        "Path to the editor for use by visudo: %s",
-    }, {
-       "env_check", T_LIST|T_BOOL,
-       "Environment variables to check for sanity:",
-    }, {
-       "env_delete", T_LIST|T_BOOL,
-       "Environment variables to remove:",
-    }, {
-       "env_keep", T_LIST|T_BOOL,
-       "Environment variables to preserve:",
     }, {
        "listpw", T_TUPLE|T_BOOL,
        "When to require a password for 'list' pseudocommand: %s",
@@ -195,7 +186,16 @@ struct sudo_defs_types sudo_defs_table[] = {
        "Preload the dummy execve() function contained in 'noexec_file'",
     }, {
        "noexec_file", T_STR|T_PATH,
-       "Path to a file containing a dummy execve() function: %s",
+       "File containing a dummy execve() function: %s",
+    }, {
+       "env_check", T_LIST|T_BOOL,
+       "Environment variables to check for sanity:",
+    }, {
+       "env_delete", T_LIST|T_BOOL,
+       "Environment variables to remove:",
+    }, {
+       "env_keep", T_LIST|T_BOOL,
+       "Environment variables to preserve:",
     }, {
        NULL, 0, NULL
     }

diff --git a/def_data.h b/def_data.h
index 7aa83f6c50a0142215e9edf897ccb61b4a096bde..21284fe5a367b7a92fbe8c1135e6d8c906b75947 100644 (file)
--- a/def_data.h
+++ b/def_data.h
@@ -98,20 +98,20 @@
 #define I_RUNAS_DEFAULT         48
 #define def_editor              (sudo_defs_table[49].sd_un.str)
 #define I_EDITOR                49
-#define def_env_check           (sudo_defs_table[50].sd_un.list)
-#define I_ENV_CHECK             50
-#define def_env_delete          (sudo_defs_table[51].sd_un.list)
-#define I_ENV_DELETE            51
-#define def_env_keep            (sudo_defs_table[52].sd_un.list)
-#define I_ENV_KEEP              52
-#define def_listpw              (sudo_defs_table[53].sd_un.tuple)
-#define I_LISTPW                53
-#define def_verifypw            (sudo_defs_table[54].sd_un.tuple)
-#define I_VERIFYPW              54
-#define def_noexec              (sudo_defs_table[55].sd_un.flag)
-#define I_NOEXEC                55
-#define def_noexec_file         (sudo_defs_table[56].sd_un.str)
-#define I_NOEXEC_FILE           56
+#define def_listpw              (sudo_defs_table[50].sd_un.tuple)
+#define I_LISTPW                50
+#define def_verifypw            (sudo_defs_table[51].sd_un.tuple)
+#define I_VERIFYPW              51
+#define def_noexec              (sudo_defs_table[52].sd_un.flag)
+#define I_NOEXEC                52
+#define def_noexec_file         (sudo_defs_table[53].sd_un.str)
+#define I_NOEXEC_FILE           53
+#define def_env_check           (sudo_defs_table[54].sd_un.list)
+#define I_ENV_CHECK             54
+#define def_env_delete          (sudo_defs_table[55].sd_un.list)
+#define I_ENV_DELETE            55
+#define def_env_keep            (sudo_defs_table[56].sd_un.list)
+#define I_ENV_KEEP              56
 
 enum def_tupple {
        never,

diff --git a/def_data.in b/def_data.in
index 053cdbf47ce5f6ee6156d803d7fc874a231d62d9..cb0603fe4d376dd98118e22a9a4d90daa1b9fa13 100644 (file)
--- a/def_data.in
+++ b/def_data.in
@@ -46,7 +46,7 @@ lecture
        never once always
 lecture_file
        T_STR|T_PATH|T_BOOL
-       "Path to a file containing the sudo lecture: %s"
+       "File containing the sudo lecture: %s"
 authenticate
        T_FLAG
        "Require users to authenticate by default"
@@ -158,15 +158,6 @@ runas_default
 editor
        T_STR|T_PATH
        "Path to the editor for use by visudo: %s"
-env_check
-       T_LIST|T_BOOL
-       "Environment variables to check for sanity:"
-env_delete
-       T_LIST|T_BOOL
-       "Environment variables to remove:"
-env_keep
-       T_LIST|T_BOOL
-       "Environment variables to preserve:"
 listpw
        T_TUPLE|T_BOOL
        "When to require a password for 'list' pseudocommand: %s"
@@ -180,4 +171,13 @@ noexec
        "Preload the dummy execve() function contained in 'noexec_file'"
 noexec_file
        T_STR|T_PATH
-       "Path to a file containing a dummy execve() function: %s"
+       "File containing a dummy execve() function: %s"
+env_check
+       T_LIST|T_BOOL
+       "Environment variables to check for sanity:"
+env_delete
+       T_LIST|T_BOOL
+       "Environment variables to remove:"
+env_keep
+       T_LIST|T_BOOL
+       "Environment variables to preserve:"