Imported Upstream version 1.6.9p6

[debian/sudo] / def_data.c

diff --git a/def_data.c b/def_data.c
index 698934f29df49fdd077376725f30b3862c95447a..b1bf17acf02f7fe9ed10aca4a506f22c466718db 100644 (file)
--- a/def_data.c
+++ b/def_data.c
@@ -146,10 +146,6 @@ struct sudo_defs_types sudo_defs_table[] = {
        "stay_setuid", T_FLAG,
        "Only set the effective uid to the target user, not the real uid",
        NULL,
-    }, {
-       "env_reset", T_FLAG,
-       "Reset the environment to a default set of variables",
-       NULL,
     }, {
        "preserve_groups", T_FLAG,
        "Don't initialize the group vector to that of the target user",
@@ -239,6 +235,18 @@ struct sudo_defs_types sudo_defs_table[] = {
        "noexec_file", T_STR|T_PATH,
        "File containing dummy exec functions: %s",
        NULL,
+    }, {
+       "ignore_local_sudoers", T_FLAG,
+       "If LDAP directory is up, do we ignore local sudoers file",
+       NULL,
+    }, {
+       "setenv", T_FLAG,
+       "Allow users to set arbitrary environment variables",
+       NULL,
+    }, {
+       "env_reset", T_FLAG,
+       "Reset the environment to a default set of variables",
+       NULL,
     }, {
        "env_check", T_LIST|T_BOOL,
        "Environment variables to check for sanity:",
@@ -251,10 +259,6 @@ struct sudo_defs_types sudo_defs_table[] = {
        "env_keep", T_LIST|T_BOOL,
        "Environment variables to preserve:",
        NULL,
-    }, {
-       "ignore_local_sudoers", T_FLAG,
-       "If LDAP directory is up, do we ignore local sudoers file",
-       NULL,
     }, {
        NULL, 0, NULL
     }