mail_if_foo -> mail_foo
This commit is contained in:
14
defaults.c
14
defaults.c
@@ -135,13 +135,13 @@ struct sudo_defs_types sudo_defs_table[] = {
|
|||||||
"mail_always", T_FLAG, { 0 },
|
"mail_always", T_FLAG, { 0 },
|
||||||
"Always send mail when sudo is run"
|
"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"
|
"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"
|
"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"
|
"Send mail if the user is not allowed to run a command"
|
||||||
}, {
|
}, {
|
||||||
"tty_tickets", T_FLAG, { 0 },
|
"tty_tickets", T_FLAG, { 0 },
|
||||||
@@ -180,7 +180,7 @@ struct sudo_defs_types sudo_defs_table[] = {
|
|||||||
"requiretty", T_FLAG, { 0 },
|
"requiretty", T_FLAG, { 0 },
|
||||||
"Only allow the user to run sudo if they have a tty"
|
"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"
|
"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, { 0 },
|
||||||
@@ -443,13 +443,13 @@ init_defaults()
|
|||||||
def_flag(I_MAIL_ALWAYS) = TRUE;
|
def_flag(I_MAIL_ALWAYS) = TRUE;
|
||||||
#endif
|
#endif
|
||||||
#ifdef SEND_MAIL_WHEN_NO_USER
|
#ifdef SEND_MAIL_WHEN_NO_USER
|
||||||
def_flag(I_MAIL_IF_NOUSER) = TRUE;
|
def_flag(I_MAIL_NOUSER) = TRUE;
|
||||||
#endif
|
#endif
|
||||||
#ifdef SEND_MAIL_WHEN_NO_HOST
|
#ifdef SEND_MAIL_WHEN_NO_HOST
|
||||||
def_flag(I_MAIL_IF_NOHOST) = TRUE;
|
def_flag(I_MAIL_NOHOST) = TRUE;
|
||||||
#endif
|
#endif
|
||||||
#ifdef SEND_MAIL_WHEN_NOT_OK
|
#ifdef SEND_MAIL_WHEN_NOT_OK
|
||||||
def_flag(I_MAIL_IF_NOPERMS) = TRUE;
|
def_flag(I_MAIL_NOPERMS) = TRUE;
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_TTY_TICKETS
|
#ifdef USE_TTY_TICKETS
|
||||||
def_flag(I_TTY_TICKETS) = TRUE;
|
def_flag(I_TTY_TICKETS) = TRUE;
|
||||||
|
@@ -84,9 +84,9 @@ struct sudo_defs_types {
|
|||||||
#define I_LONG_OTP_PROMPT 6
|
#define I_LONG_OTP_PROMPT 6
|
||||||
#define I_IGNORE_DOT 7
|
#define I_IGNORE_DOT 7
|
||||||
#define I_MAIL_ALWAYS 8
|
#define I_MAIL_ALWAYS 8
|
||||||
#define I_MAIL_IF_NOUSER 9
|
#define I_MAIL_NOUSER 9
|
||||||
#define I_MAIL_IF_NOHOST 10
|
#define I_MAIL_NOHOST 10
|
||||||
#define I_MAIL_IF_NOPERMS 11
|
#define I_MAIL_NOPERMS 11
|
||||||
#define I_TTY_TICKETS 12
|
#define I_TTY_TICKETS 12
|
||||||
#define I_LECTURE 13
|
#define I_LECTURE 13
|
||||||
#define I_AUTHENTICATE 14
|
#define I_AUTHENTICATE 14
|
||||||
|
@@ -518,11 +518,11 @@ mail_auth(status, line)
|
|||||||
VALIDATE_ERROR|VALIDATE_OK|FLAG_NO_USER|FLAG_NO_HOST|VALIDATE_NOT_OK;
|
VALIDATE_ERROR|VALIDATE_OK|FLAG_NO_USER|FLAG_NO_HOST|VALIDATE_NOT_OK;
|
||||||
else {
|
else {
|
||||||
mail_mask = VALIDATE_ERROR;
|
mail_mask = VALIDATE_ERROR;
|
||||||
if (def_flag(I_MAIL_IF_NOUSER))
|
if (def_flag(I_MAIL_NOUSER))
|
||||||
mail_mask |= FLAG_NO_USER;
|
mail_mask |= FLAG_NO_USER;
|
||||||
if (def_flag(I_MAIL_IF_NOHOST))
|
if (def_flag(I_MAIL_NOHOST))
|
||||||
mail_mask |= FLAG_NO_HOST;
|
mail_mask |= FLAG_NO_HOST;
|
||||||
if (def_flag(I_MAIL_IF_NOPERMS))
|
if (def_flag(I_MAIL_NOPERMS))
|
||||||
mail_mask |= VALIDATE_NOT_OK;
|
mail_mask |= VALIDATE_NOT_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user