isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bzero -> memset

Browse Source 
when a parse error is logged the line number of the error is now logged
too
This commit is contained in:
Todd C. Miller
1995-03-30 02:47:00 +00:00
parent 25d8da8ad2
commit 222d260765
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
logging.c
View File

@@ -74,6 +74,7 @@ static int appropriate __P((int));
* Globals * Globals
*/ */
static char logline[MAXLOGLEN + 8]; static char logline[MAXLOGLEN + 8];
extern int errorlineno;
/********************************************************************** /**********************************************************************
@@ -137,8 +138,8 @@ void log_error(code)
break; break;
case VALIDATE_ERROR: case VALIDATE_ERROR:
(void) sprintf(p, "error in %s ; PWD=%s ; command: ", (void) sprintf(p, "error in %s, line %d ; PWD=%s. ",
_PATH_SUDO_SUDOERS, cwd); _PATH_SUDO_SUDOERS, errorlineno, cwd);
#if (LOGGING & SLOG_SYSLOG) #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* LOGGING & SLOG_SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
@@ -204,9 +205,10 @@ void log_error(code)
/* /*
* if this error is from load_globals() don't put argv in the message * If this is a parse error or if the error is from load_globals()
* don't put argv in the message.
*/ */
if (!(code & GLOBAL_PROBLEM)) { if (code != VALIDATE_ERROR && !(code & GLOBAL_PROBLEM)) {
strcat(logline, cmnd); /* stuff the command into the logline */ strcat(logline, cmnd); /* stuff the command into the logline */
strcat(logline, " "); strcat(logline, " ");
@@ -377,7 +379,7 @@ static void send_mail()
#ifdef POSIX_SIGNALS #ifdef POSIX_SIGNALS
struct sigaction action; struct sigaction action;
(void) bzero((char *)(&action), sizeof(action)); (void) memset((VOID *)&action, 0, sizeof(action));
#endif /* POSIX_SIGNALS */ #endif /* POSIX_SIGNALS */
if ((mailer = find_path(MAILER)) == NULL) { if ((mailer = find_path(MAILER)) == NULL) {