mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 06:45:10 +00:00
Code Issues Releases Wiki Activity

now logs "USER=%s"

Browse Source
This commit is contained in:
Todd C. Miller
1996-04-28 21:15:03 +00:00
parent 7c95809719
commit 36f1208492
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
logging.c
View File

@@ -86,7 +86,6 @@ static void syslog_wrapper __P((int, char *, char *, char *));
*/ */
static char *logline; static char *logline;
extern int errorlineno; extern int errorlineno;
extern char *runas_user;
/* /*
* length of syslog-like header info used for mail and file logs * length of syslog-like header info used for mail and file logs
@@ -152,7 +151,8 @@ void log_error(code)
/* /*
* Allocate enough memory for logline so we won't overflow it * Allocate enough memory for logline so we won't overflow it
*/ */
count = LOG_HEADER_LEN + 128 + 2 * MAXPATHLEN + strlen(tty) + strlen(cwd); count = LOG_HEADER_LEN + 136 + 2 * MAXPATHLEN + strlen(tty) + strlen(cwd) +
strlen(runas_user);
if (NewArgc > 1) if (NewArgc > 1)
for (a = &NewArgv[1]; *a; a++) for (a = &NewArgv[1]; *a; a++)
count += strlen(*a) + 1; count += strlen(*a) + 1;
@@ -180,7 +180,8 @@ void log_error(code)
switch (code) { switch (code) {
case ALL_SYSTEMS_GO: case ALL_SYSTEMS_GO:
(void) sprintf(p, "TTY=%s ; PWD=%s ; COMMAND=", tty, cwd); (void) sprintf(p, "TTY=%s ; PWD=%s ; USER=%s ; COMMAND=",
tty, cwd, runas_user);
#if (LOGGING & SLOG_SYSLOG) #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_OK; pri = Syslog_priority_OK;
#endif /* LOGGING & SLOG_SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
@@ -188,17 +189,19 @@ void log_error(code)
case VALIDATE_NO_USER: case VALIDATE_NO_USER:
(void) sprintf(p, (void) sprintf(p,
"user NOT in sudoers ; TTY=%s ; PWD=%s ; COMMAND=", tty, cwd); "user NOT in sudoers ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=",
tty, cwd, runas_user);
break; break;
case VALIDATE_NOT_OK: case VALIDATE_NOT_OK:
(void) sprintf(p, (void) sprintf(p,
"command not allowed ; TTY=%s ; PWD=%s ; COMMAND=", tty, cwd); "command not allowed ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=",
tty, cwd, runas_user);
break; break;
case VALIDATE_ERROR: case VALIDATE_ERROR:
(void) sprintf(p, "error in %s, line %d ; TTY=%s ; PWD=%s. ", (void) sprintf(p, "error in %s, line %d ; TTY=%s ; PWD=%s ; USER=%s. ",
_PATH_SUDO_SUDOERS, errorlineno, tty, cwd); _PATH_SUDO_SUDOERS, errorlineno, tty, cwd, runas_user);
break; break;
case GLOBAL_NO_PW_ENT: case GLOBAL_NO_PW_ENT:
@@ -209,13 +212,14 @@ void log_error(code)
case PASSWORD_NOT_CORRECT: case PASSWORD_NOT_CORRECT:
(void) sprintf(p, (void) sprintf(p,
"password incorrect ; TTY=%s ; PWD=%s ; COMMAND=", tty, cwd); "password incorrect ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=",
tty, cwd, runas_user);
break; break;
case PASSWORDS_NOT_CORRECT: case PASSWORDS_NOT_CORRECT:
(void) sprintf(p, (void) sprintf(p,
"%d incorrect passwords ; TTY=%s ; PWD=%s ; COMMAND=", "%d incorrect passwords ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=",
TRIES_FOR_PASSWORD, tty, cwd); TRIES_FOR_PASSWORD, tty, cwd, runas_user);
break; break;
case GLOBAL_NO_HOSTNAME: case GLOBAL_NO_HOSTNAME:
@@ -258,20 +262,20 @@ void log_error(code)
case SPOOF_ATTEMPT: case SPOOF_ATTEMPT:
(void) sprintf(p, (void) sprintf(p,
"probable spoofing attempt; TTY=%s ; PWD=%s ; COMMAND=", "probable spoofing attempt; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=",
tty, cwd); tty, cwd, runas_user);
break; break;
case BAD_STAMPDIR: case BAD_STAMPDIR:
(void) sprintf(p, (void) sprintf(p,
"%s owned by non-root or not mode 0700; TTY=%s ; PWD=%s ; COMMAND=", "%s owned by non-root or not mode 0700; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=",
_PATH_SUDO_TIMEDIR, tty, cwd); _PATH_SUDO_TIMEDIR, tty, cwd, runas_user);
break; break;
case BAD_STAMPFILE: case BAD_STAMPFILE:
(void) sprintf(p, (void) sprintf(p,
"preposterous stampfile date; TTY=%s ; PWD=%s ; COMMAND=", "preposterous stampfile date; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=",
tty, cwd); tty, cwd, runas_user);
break; break;
default: default:
@@ -563,10 +567,7 @@ void inform_user(code)
fputs(*a, stderr); fputs(*a, stderr);
} }
if (runas_user != NULL) (void) fprintf(stderr, "\" as %s on %s.\n\n", runas_user, host);
(void) fprintf(stderr, "\" as %s on %s.\n\n", runas_user, host);
else
(void) fprintf(stderr, "\" on %s.\n\n", host);
break; break;
case VALIDATE_ERROR: case VALIDATE_ERROR: