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

changed #ifdef's to use LOGGING and SLOG_SYSLOG/SLOG_FILE

Browse Source
This commit is contained in:
Todd C. Miller
1995-01-11 23:36:53 +00:00
parent 25f7b5cf1c
commit e4452a2ed0
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
logging.c
View File

@@ -92,13 +92,13 @@ void log_error(code)
register char *p; register char *p;
register int count; register int count;
time_t now; time_t now;
#ifdef _PATH_SUDO_LOGFILE #if (LOGGING & SLOG_FILE)
register FILE *fp; register FILE *fp;
#endif /* _PATH_SUDO_LOGFILE */ #endif /* LOGGING & SLOG_FILE */
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
register int pri; /* syslog priority */ register int pri; /* syslog priority */
char *tmp, save; char *tmp, save;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
/* /*
* we will skip this stuff when using syslog(3) but it is * we will skip this stuff when using syslog(3) but it is
@@ -116,54 +116,54 @@ void log_error(code)
case ALL_SYSTEMS_GO: case ALL_SYSTEMS_GO:
(void) sprintf(p, "PWD=%s ; COMMAND=", cwd); (void) sprintf(p, "PWD=%s ; COMMAND=", cwd);
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_OK; pri = Syslog_priority_OK;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
case VALIDATE_NO_USER: case VALIDATE_NO_USER:
(void) sprintf(p, "user NOT in sudoers ; PWD=%s ; COMMAND=", cwd); (void) sprintf(p, "user NOT in sudoers ; PWD=%s ; COMMAND=", cwd);
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
case VALIDATE_NOT_OK: case VALIDATE_NOT_OK:
(void) sprintf(p, "command not allowed ; PWD=%s ; COMMAND=", cwd); (void) sprintf(p, "command not allowed ; PWD=%s ; COMMAND=", cwd);
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
case VALIDATE_ERROR: case VALIDATE_ERROR:
(void) sprintf(p, "error in %s ; PWD=%s ; command: ", (void) sprintf(p, "error in %s ; PWD=%s ; command: ",
_PATH_SUDO_SUDOERS, cwd); _PATH_SUDO_SUDOERS, cwd);
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
case GLOBAL_NO_PW_ENT: case GLOBAL_NO_PW_ENT:
(void) sprintf(p, "There is no /etc/passwd entry for uid %d. ", (void) sprintf(p, "There is no /etc/passwd entry for uid %d. ",
uid); uid);
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
case PASSWORD_NOT_CORRECT: case PASSWORD_NOT_CORRECT:
(void) sprintf(p, "%d incorrect passwords ; PWD=%s ; COMMAND=", (void) sprintf(p, "%d incorrect passwords ; PWD=%s ; COMMAND=",
TRIES_FOR_PASSWORD, cwd); TRIES_FOR_PASSWORD, cwd);
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
case GLOBAL_NO_HOSTNAME: case GLOBAL_NO_HOSTNAME:
strcat(p, "This machine does not have a hostname "); strcat(p, "This machine does not have a hostname ");
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
case NO_SUDOERS_FILE: case NO_SUDOERS_FILE:
@@ -181,23 +181,23 @@ void log_error(code)
_PATH_SUDO_SUDOERS); _PATH_SUDO_SUDOERS);
break; break;
} }
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
case GLOBAL_HOST_UNREGISTERED: case GLOBAL_HOST_UNREGISTERED:
(void) sprintf(p, "gethostbyname() cannot find host %s ", host); (void) sprintf(p, "gethostbyname() cannot find host %s ", host);
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
default: default:
strcat(p, "found a wierd error : "); strcat(p, "found a wierd error : ");
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
pri = Syslog_priority_NO; pri = Syslog_priority_NO;
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
break; break;
} }
@@ -231,7 +231,7 @@ void log_error(code)
} }
#ifdef SYSLOG #if (LOGGING & SLOG_SYSLOG)
#ifdef Syslog_facility #ifdef Syslog_facility
openlog(Syslog_ident, Syslog_options, Syslog_facility); openlog(Syslog_ident, Syslog_options, Syslog_facility);
#else #else
@@ -275,8 +275,8 @@ void log_error(code)
} }
} }
closelog(); closelog();
#endif /* SYSLOG */ #endif /* LOGGING & SLOG_SYSLOG */
#ifdef _PATH_SUDO_LOGFILE #if (LOGGING & SLOG_FILE)
/* become root */ /* become root */
set_perms(PERM_ROOT); set_perms(PERM_ROOT);
@@ -344,7 +344,7 @@ void log_error(code)
/* relinquish root */ /* relinquish root */
set_perms(PERM_USER); set_perms(PERM_USER);
#endif /* _PATH_SUDO_LOGFILE */ #endif /* LOGGING & SLOG_FILE */
/* send mail if appropriate */ /* send mail if appropriate */
if (appropriate(code)) if (appropriate(code))