mail_if_foo -> mail_foo

diff --git a/defaults.c b/defaults.c
index 9d6abea2450b9ea102005efb0247378a445e538b..3287cc73370a999d437a5acd99a568a50d837f48 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -135,13 +135,13 @@ struct sudo_defs_types sudo_defs_table[] = {
        "mail_always", T_FLAG, { 0 },
        "Always send mail when sudo is run"
     }, {
-       "mail_if_no_user", T_FLAG, { 0 },
+       "mail_no_user", T_FLAG, { 0 },
        "Send mail if the user is not in sudoers"
     }, {
-       "mail_if_no_host", T_FLAG, { 0 },
+       "mail_no_host", T_FLAG, { 0 },
        "Send mail if the user is not in sudoers for this host"
     }, {
-       "mail_if_no_perms", T_FLAG, { 0 },
+       "mail_no_perms", T_FLAG, { 0 },
        "Send mail if the user is not allowed to run a command"
     }, {
        "tty_tickets", T_FLAG, { 0 },
@@ -180,7 +180,7 @@ struct sudo_defs_types sudo_defs_table[] = {
        "requiretty", T_FLAG, { 0 },
        "Only allow the user to run sudo if they have a tty"
     }, {
-       "loglinelen", T_INT, { 0 },
+       "loglinelen", T_INT|T_BOOL, { 0 },
        "Length at which to wrap log file lines (0 for no wrap): %d"
     }, {
        "timestamp_timeout", T_INT|T_BOOL, { 0 },
@@ -443,13 +443,13 @@ init_defaults()
     def_flag(I_MAIL_ALWAYS) = TRUE;
 #endif
 #ifdef SEND_MAIL_WHEN_NO_USER
-    def_flag(I_MAIL_IF_NOUSER) = TRUE;
+    def_flag(I_MAIL_NOUSER) = TRUE;
 #endif
 #ifdef SEND_MAIL_WHEN_NO_HOST
-    def_flag(I_MAIL_IF_NOHOST) = TRUE;
+    def_flag(I_MAIL_NOHOST) = TRUE;
 #endif
 #ifdef SEND_MAIL_WHEN_NOT_OK
-    def_flag(I_MAIL_IF_NOPERMS) = TRUE;
+    def_flag(I_MAIL_NOPERMS) = TRUE;
 #endif
 #ifdef USE_TTY_TICKETS
     def_flag(I_TTY_TICKETS) = TRUE;

diff --git a/defaults.h b/defaults.h
index 6121cbe6c13bd1f7bab952ab8dc38ddc59542045..76d12f4413b1e734b485e9c555cdf4e08ff5d8c5 100644 (file)
--- a/defaults.h
+++ b/defaults.h
@@ -84,9 +84,9 @@ struct sudo_defs_types {
 #define I_LONG_OTP_PROMPT      6
 #define I_IGNORE_DOT           7
 #define I_MAIL_ALWAYS          8
-#define I_MAIL_IF_NOUSER       9
-#define I_MAIL_IF_NOHOST       10
-#define I_MAIL_IF_NOPERMS      11
+#define I_MAIL_NOUSER          9
+#define I_MAIL_NOHOST          10
+#define I_MAIL_NOPERMS         11
 #define I_TTY_TICKETS          12
 #define I_LECTURE              13
 #define I_AUTHENTICATE         14

diff --git a/logging.c b/logging.c
index 224fa4d8a4cf6d49183bb69ff96390cacea43c60..eaf9e84d5c4b307863c2e3d670b9d908f546adfb 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -518,11 +518,11 @@ mail_auth(status, line)
            VALIDATE_ERROR|VALIDATE_OK|FLAG_NO_USER|FLAG_NO_HOST|VALIDATE_NOT_OK;
     else {
        mail_mask = VALIDATE_ERROR;
-       if (def_flag(I_MAIL_IF_NOUSER))
+       if (def_flag(I_MAIL_NOUSER))
            mail_mask |= FLAG_NO_USER;
-       if (def_flag(I_MAIL_IF_NOHOST))
+       if (def_flag(I_MAIL_NOHOST))
            mail_mask |= FLAG_NO_HOST;
-       if (def_flag(I_MAIL_IF_NOPERMS))
+       if (def_flag(I_MAIL_NOPERMS))
            mail_mask |= VALIDATE_NOT_OK;
     }