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

log_exit_status: make local variables match struct evlog members.

Browse Source
This commit is contained in:
Todd C. Miller
2022-06-14 13:10:13 -06:00
parent 5787da7b21
commit 49c27f5278
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/sudoers/logging.c
View File

@@ -573,15 +573,15 @@ log_allowed(struct eventlog *evlog)
} }
bool bool
log_exit_status(int exit_status) log_exit_status(int status)
{ {
struct eventlog evlog; struct eventlog evlog;
int evl_flags = 0; int evl_flags = 0;
int ecode = 0; int exit_value = 0;
int oldlocale; int oldlocale;
struct timespec run_time; struct timespec run_time;
char sigbuf[SIG2STR_MAX]; char sigbuf[SIG2STR_MAX];
char *signame = NULL; char *signal_name = NULL;
bool dumped_core = false; bool dumped_core = false;
bool ret = true; bool ret = true;
debug_decl(log_exit_status, SUDOERS_DEBUG_LOGGING); debug_decl(log_exit_status, SUDOERS_DEBUG_LOGGING);
@@ -594,17 +594,17 @@ log_exit_status(int exit_status)
} }
sudo_timespecsub(&run_time, &sudo_user.submit_time, &run_time); sudo_timespecsub(&run_time, &sudo_user.submit_time, &run_time);
if (WIFEXITED(exit_status)) { if (WIFEXITED(status)) {
ecode = WEXITSTATUS(exit_status); exit_value = WEXITSTATUS(status);
} else if (WIFSIGNALED(exit_status)) { } else if (WIFSIGNALED(status)) {
int signo = WTERMSIG(exit_status); int signo = WTERMSIG(status);
if (signo <= 0 || sig2str(signo, sigbuf) == -1) if (signo <= 0 || sig2str(signo, sigbuf) == -1)
(void)snprintf(sigbuf, sizeof(sigbuf), "%d", signo); (void)snprintf(sigbuf, sizeof(sigbuf), "%d", signo);
signame = sigbuf; signal_name = sigbuf;
ecode = signo | 128; exit_value = signo | 128;
dumped_core = WCOREDUMP(exit_status); dumped_core = WCOREDUMP(status);
} else { } else {
sudo_warnx("invalid exit status 0x%x", exit_status); sudo_warnx("invalid exit status 0x%x", status);
ret = false; ret = false;
goto done; goto done;
} }
@@ -619,8 +619,8 @@ log_exit_status(int exit_status)
SET(evl_flags, EVLOG_MAIL_ONLY); SET(evl_flags, EVLOG_MAIL_ONLY);
} }
evlog.run_time = run_time; evlog.run_time = run_time;
evlog.exit_value = ecode; evlog.exit_value = exit_value;
evlog.signal_name = signame; evlog.signal_name = signal_name;
evlog.dumped_core = dumped_core; evlog.dumped_core = dumped_core;
if (!eventlog_exit(&evlog, evl_flags)) if (!eventlog_exit(&evlog, evl_flags))
ret = false; ret = false;