Merge commit 'upstream/1.7.4p6'

[debian/sudo] / def_data.c

diff --git a/def_data.c b/def_data.c
index 8498464dbe1e32250589ead5ae1eb9bb973fe3c9..fbdc0c791fca4b879ac3d7ad8d3e76c3f8aba82a 100644 (file)
--- a/def_data.c
+++ b/def_data.c
@@ -155,12 +155,12 @@ struct sudo_defs_types sudo_defs_table[] = {
        "Length at which to wrap log file lines (0 for no wrap): %d",
        NULL,
     }, {
-       "timestamp_timeout", T_INT|T_BOOL,
-       "Authentication timestamp timeout: %d minutes",
+       "timestamp_timeout", T_FLOAT|T_BOOL,
+       "Authentication timestamp timeout: %.1f minutes",
        NULL,
     }, {
-       "passwd_timeout", T_UINT|T_BOOL,
-       "Password prompt timeout: %d minutes",
+       "passwd_timeout", T_FLOAT|T_BOOL,
+       "Password prompt timeout: %.1f minutes",
        NULL,
     }, {
        "passwd_tries", T_UINT,
@@ -314,6 +314,22 @@ struct sudo_defs_types sudo_defs_table[] = {
        "umask_override", T_FLAG,
        "The umask specified in sudoers will override the user's, even if it is more permissive",
        NULL,
+    }, {
+       "log_input", T_FLAG,
+       "Log user's input for the command being run",
+       NULL,
+    }, {
+       "log_output", T_FLAG,
+       "Log the output of the command being run",
+       NULL,
+    }, {
+       "compress_io", T_FLAG,
+       "Compress I/O logs using zlib",
+       NULL,
+    }, {
+       "use_pty", T_FLAG,
+       "Always run commands in a pseudo-tty",
+       NULL,
     }, {
        NULL, 0, NULL
     }