Pass argc to audit functions too. Will be needed for Solaris audit

support.
This commit is contained in:
Todd C. Miller
2014-05-13 09:41:53 -06:00
parent ffb07443c3
commit 337a712745
9 changed files with 36 additions and 34 deletions

View File

@@ -95,8 +95,6 @@ static sudo_auth auth_switch[] = {
static int standalone;
extern char **NewArgv; /* XXX - for auditing */
static void pass_warn(void);
/*
@@ -116,7 +114,7 @@ sudo_auth_init(struct passwd *pw)
/* Make sure we haven't mixed standalone and shared auth methods. */
standalone = IS_STANDALONE(&auth_switch[0]);
if (standalone && auth_switch[1].name != NULL) {
audit_failure(NewArgv, N_("invalid authentication methods"));
audit_failure(NewArgc, NewArgv, N_("invalid authentication methods"));
log_warningx(SLOG_SEND_MAIL,
N_("Invalid authentication methods compiled into sudo! "
"You may not mix standalone and non-standalone authentication."));
@@ -187,7 +185,7 @@ verify_user(struct passwd *pw, char *prompt, int validated)
/* Make sure we have at least one auth method. */
/* XXX - check FLAG_DISABLED too */
if (auth_switch[0].name == NULL) {
audit_failure(NewArgv, N_("no authentication methods"));
audit_failure(NewArgc, NewArgv, N_("no authentication methods"));
log_warningx(SLOG_SEND_MAIL,
N_("There are no authentication methods compiled into sudo! "
"If you want to turn off authentication, use the "