In struct sudo_defs_types, move the union to the end and don't initialize

the union member since that only works with an ANSI compiler.  We set
the value of the union by hand in init_defaults() anyway.  This allows
sudo to compile on a K&R compiler again.

diff --git a/defaults.c b/defaults.c
index 73ec7608c71ad0e682a9f68b5ca06978a83e6bca..aa81dc5d469750e432fb04adaf57b5a8c976c130 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -112,124 +112,121 @@ static int store_mode __P((char *, struct sudo_defs_types *, int));
  */
 struct sudo_defs_types sudo_defs_table[] = {
     {
-       "syslog_ifac", T_INT, { 0 },
-       NULL
+       "syslog_ifac", T_INT, NULL
     }, {
-       "syslog_igoodpri", T_INT, { 0 },
-       NULL
+       "syslog_igoodpri", T_INT, NULL
     }, {
-       "syslog_ibadpri", T_INT, { 0 },
-       NULL
+       "syslog_ibadpri", T_INT, NULL
     }, {
-       "syslog", T_LOGFAC|T_BOOL, { 0 },
+       "syslog", T_LOGFAC|T_BOOL,
        "Syslog facility if syslog is being used for logging: %s"
     }, {
-       "syslog_goodpri", T_LOGPRI, { 0 },
+       "syslog_goodpri", T_LOGPRI,
        "Syslog priority to use when user authenticates successfully: %s"
     }, {
-       "syslog_badpri", T_LOGPRI, { 0 },
+       "syslog_badpri", T_LOGPRI,
        "Syslog priority to use when user authenticates unsuccessfully: %s"
     }, {
-       "long_otp_prompt", T_FLAG, { 0 },
+       "long_otp_prompt", T_FLAG,
        "Put OTP prompt on its own line"
     }, {
-       "ignore_dot", T_FLAG, { 0 },
+       "ignore_dot", T_FLAG,
        "Ignore '.' in $PATH"
     }, {
-       "mail_always", T_FLAG, { 0 },
+       "mail_always", T_FLAG,
        "Always send mail when sudo is run"
     }, {
-       "mail_no_user", T_FLAG, { 0 },
+       "mail_no_user", T_FLAG,
        "Send mail if the user is not in sudoers"
     }, {
-       "mail_no_host", T_FLAG, { 0 },
+       "mail_no_host", T_FLAG,
        "Send mail if the user is not in sudoers for this host"
     }, {
-       "mail_no_perms", T_FLAG, { 0 },
+       "mail_no_perms", T_FLAG,
        "Send mail if the user is not allowed to run a command"
     }, {
-       "tty_tickets", T_FLAG, { 0 },
+       "tty_tickets", T_FLAG,
        "Use a separate timestamp for each user/tty combo"
     }, {
-       "lecture", T_FLAG, { 0 },
+       "lecture", T_FLAG,
        "Lecture user the first time they run sudo"
     }, {
-       "authenticate", T_FLAG, { 0 },
+       "authenticate", T_FLAG,
        "Require users to authenticate by default"
     }, {
-       "root_sudo", T_FLAG, { 0 },
+       "root_sudo", T_FLAG,
        "Root may run sudo"
     }, {
-       "log_host", T_FLAG, { 0 },
+       "log_host", T_FLAG,
        "Log the hostname in the (non-syslog) log file"
     }, {
-       "log_year", T_FLAG, { 0 },
+       "log_year", T_FLAG,
        "Log the year in the (non-syslog) log file"
     }, {
-       "set_home", T_FLAG, { 0 },
+       "set_home", T_FLAG,
        "Set $HOME to the target user when starting a shell with -s"
     }, {
-       "path_info", T_FLAG, { 0 },
+       "path_info", T_FLAG,
        "Allow some information gathering to give useful error messages"
     }, {
-       "fqdn", T_FLAG, { 0 },
+       "fqdn", T_FLAG,
        "Require fully-qualified hsotnames in the sudoers file"
     }, {
-       "insults", T_FLAG, { 0 },
+       "insults", T_FLAG,
        "Insult the user when they enter an incorrect password"
     }, {
-       "requiretty", T_FLAG, { 0 },
+       "requiretty", T_FLAG,
        "Only allow the user to run sudo if they have a tty"
     }, {
-       "loglinelen", T_INT|T_BOOL, { 0 },
+       "loglinelen", T_INT|T_BOOL,
        "Length at which to wrap log file lines (0 for no wrap): %d"
     }, {
-       "timestamp_timeout", T_INT|T_BOOL, { 0 },
+       "timestamp_timeout", T_INT|T_BOOL,
        "Authentication timestamp timeout: %d minutes"
     }, {
-       "passwd_timeout", T_INT|T_BOOL, { 0 },
+       "passwd_timeout", T_INT|T_BOOL,
        "Password prompt timeout: %d minutes"
     }, {
-       "passwd_tries", T_INT, { 0 },
+       "passwd_tries", T_INT,
        "Number of tries to enter a password: %d"
     }, {
-       "umask", T_MODE|T_BOOL, { 0 },
+       "umask", T_MODE|T_BOOL,
        "Umask to use or 0777 to use user's: 0%o"
     }, {
-       "logfile", T_STR|T_BOOL|T_PATH, { 0 },
+       "logfile", T_STR|T_BOOL|T_PATH,
        "Path to log file: %s"
     }, {
-       "mailerpath", T_STR|T_BOOL|T_PATH, { 0 },
+       "mailerpath", T_STR|T_BOOL|T_PATH,
        "Path to mail program: %s"
     }, {
-       "mailerflags", T_STR|T_BOOL, { 0 },
+       "mailerflags", T_STR|T_BOOL,
        "Flags for mail program: %s"
     }, {
-       "mailto", T_STR|T_BOOL, { 0 },
+       "mailto", T_STR|T_BOOL,
        "Address to send mail to: %s"
     }, {
-       "mailsub", T_STR, { 0 },
+       "mailsub", T_STR,
        "Subject line for mail messages: %s"
     }, {
-       "badpass_message", T_STR, { 0 },
+       "badpass_message", T_STR,
        "Incorrect password message: %s"
     }, {
-       "timestampdir", T_STR|T_PATH, { 0 },
+       "timestampdir", T_STR|T_PATH,
        "Path to authentication timestamp dir: %s"
     }, {
-       "exempt_group", T_STR|T_BOOL, { 0 },
+       "exempt_group", T_STR|T_BOOL,
        "Users in this group are exempt from password and PATH requirements: %s"
     }, {
-       "passprompt", T_STR, { 0 },
+       "passprompt", T_STR,
        "Default password prompt: %s"
     }, {
-       "runas_default", T_STR, { 0 },
+       "runas_default", T_STR,
        "Default user to run commands as: %s"
     }, {
-       "secure_path", T_STR|T_BOOL, { 0 },
+       "secure_path", T_STR|T_BOOL,
        "Value to override user's $PATH with: %s"
     }, {
-       NULL, 0, { 0 }, NULL
+       NULL, 0, NULL
     }
 };
 

diff --git a/defaults.h b/defaults.h
index 79014851d6d9bdc31b2832b96ae2bd48800cd55a..9828fdf908059dbf8ce802355510c0ae4f1ed1cd 100644 (file)
--- a/defaults.h
+++ b/defaults.h
@@ -43,13 +43,13 @@
 struct sudo_defs_types {
     char *name;
     int type;
+    char *desc;
     union {
        int flag;
        char *str;
        unsigned int ival;
        mode_t mode;
     } sd_un;
-    char *desc;
 };
 
 /*