Merge commit 'upstream/1.7.2p6'

[debian/sudo] / def_data.in

diff --git a/def_data.in b/def_data.in
index fb16f7554bf7dd165608e90544f9bbf4e4aa5247..625c1409729d61ebcc34958626899bef7e23ccaf 100644 (file)
--- a/def_data.in
+++ b/def_data.in
@@ -6,6 +6,9 @@
 #      description (or NULL)
 #      array of struct def_values if TYPE == T_TUPLE
 #
+# NOTE: for tuples that can be used in a boolean context the first
+#      value corresponds to boolean FALSE and the second to TRUE.
+#
 
 syslog
        T_LOGFAC|T_BOOL
@@ -131,6 +134,9 @@ mailerflags
 mailto
        T_STR|T_BOOL
        "Address to send mail to: %s"
+mailfrom
+       T_STR|T_BOOL
+       "Address to send mail from: %s"
 mailsub
        T_STR
        "Subject line for mail messages: %s"
@@ -155,7 +161,9 @@ passprompt_override
 runas_default
        T_STR
        "Default user to run commands as: %s"
-       *set_runaspw
+secure_path
+       T_STR|T_BOOL
+       "Value to override user's $PATH with: %s"
 editor
        T_STR|T_PATH
        "Path to the editor for use by visudo: %s"
@@ -176,6 +184,12 @@ noexec_file
 ignore_local_sudoers
        T_FLAG
        "If LDAP directory is up, do we ignore local sudoers file"
+closefrom
+       T_INT
+       "File descriptors >= %d will be closed before executing a command"
+closefrom_override
+       T_FLAG
+       "If set, users may override the value of `closefrom' with the -C option"
 setenv
        T_FLAG
        "Allow users to set arbitrary environment variables"
@@ -193,7 +207,28 @@ env_keep
        "Environment variables to preserve:"
 role
        T_STR
-       "SELinux role to use in the new security context"
+       "SELinux role to use in the new security context: %s"
 type
        T_STR
-       "SELinux type to use in the new security context"
+       "SELinux type to use in the new security context: %s"
+askpass
+       T_STR|T_PATH|T_BOOL
+       "Path to the askpass helper program: %s"
+env_file
+       T_STR|T_PATH|T_BOOL
+       "Path to the sudo-specific environment file: %s"
+sudoers_locale
+       T_STR
+       "Locale to use while parsing sudoers: %s"
+visiblepw
+       T_FLAG
+       "Allow sudo to prompt for a password even if it would be visisble"
+pwfeedback
+       T_FLAG
+       "Provide visual feedback at the password prompt when there is user input"
+fast_glob
+       T_FLAG
+       "Use faster globbing that is less accurate but does not access the filesystem"
+umask_override
+       T_FLAG
+       "The umask specified in sudoers will override the user's, even if it is more permissive"