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

Rename submit_time -> event_time in struct eventlog.

Browse Source
This commit is contained in:
Todd C. Miller
2023-11-23 09:08:04 -05:00
parent 0e53d5fddf
commit b9275b7eab
13 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/audit.c
View File

@@ -447,7 +447,7 @@ sudoers_audit_error(const char *plugin_name, unsigned int plugin_type,
}
audit_to_eventlog(ctx, &evlog, command_info, ctx->runas.argv, NULL, NULL);
if (!eventlog_alert(&evlog, 0, &evlog.submit_time, message, NULL))
if (!eventlog_alert(&evlog, 0, &evlog.event_time, message, NULL))
ret = false;
if (!log_server_alert(ctx, &evlog, message, NULL))

2
plugins/sudoers/iolog.c
View File

@@ -314,7 +314,7 @@ iolog_deserialize_info(struct log_details *details, char * const user_info[],
evlog->columns = 80;
evlog->runuid = ROOT_UID;
evlog->rungid = 0;
sudo_gettime_real(&evlog->submit_time);
sudo_gettime_real(&evlog->event_time);
for (cur = user_info; *cur != NULL; cur++) {
switch (**cur) {

4
plugins/sudoers/logging.c
View File

@@ -741,7 +741,7 @@ vlog_warning(const struct sudoers_context *ctx, unsigned int flags,
}
sudoers_to_eventlog(ctx, &evlog, ctx->runas.cmnd, ctx->runas.argv,
NULL, ctx->uuid_str);
if (!eventlog_alert(&evlog, evl_flags, &evlog.submit_time, message, errstr))
if (!eventlog_alert(&evlog, evl_flags, &evlog.event_time, message, errstr))
ret = false;
if (!log_server_alert(ctx, &evlog, message, errstr))
ret = false;
@@ -1005,7 +1005,7 @@ sudoers_to_eventlog(const struct sudoers_context *ctx, struct eventlog *evlog,
evlog->env_add = (char **)ctx->user.env_add;
evlog->runenv = (char **)runenv;
evlog->submitenv = (char **)ctx->user.envp;
if (sudo_gettime_real(&evlog->submit_time) == -1) {
if (sudo_gettime_real(&evlog->event_time) == -1) {
sudo_warn("%s", U_("unable to get time of day"));
}
evlog->lines = ctx->user.lines;

6
plugins/sudoers/regress/iolog_plugin/check_iolog_plugin.c
View File

@@ -144,9 +144,9 @@ validate_iolog_info(const char *log_dir, bool legacy)
return false;
}
if (evlog->submit_time.tv_sec < now - 10 || evlog->submit_time.tv_sec > now + 10) {
sudo_warnx("bad submit_time: want %lld got %lld", (long long)now,
(long long)evlog->submit_time.tv_sec);
if (evlog->event_time.tv_sec < now - 10 || evlog->event_time.tv_sec > now + 10) {
sudo_warnx("bad event_time: want %lld got %lld", (long long)now,
(long long)evlog->event_time.tv_sec);
return false;
}

6
plugins/sudoers/sudoreplay.c
View File

@@ -1411,10 +1411,10 @@ match_expr(struct search_node_list *head, struct eventlog *evlog, bool last_matc
free(tofree);
break;
case ST_FROMDATE:
res = sudo_timespeccmp(&evlog->submit_time, &sn->u.tstamp, >=);
res = sudo_timespeccmp(&evlog->event_time, &sn->u.tstamp, >=);
break;
case ST_TODATE:
res = sudo_timespeccmp(&evlog->submit_time, &sn->u.tstamp, <=);
res = sudo_timespeccmp(&evlog->event_time, &sn->u.tstamp, <=);
break;
default:
sudo_fatalx(U_("unknown search type %d"), sn->type);
@@ -1450,7 +1450,7 @@ list_session(struct sudo_lbuf *lbuf, char *log_dir, regex_t *re,
if (!STAILQ_EMPTY(&search_expr) && !match_expr(&search_expr, evlog, true))
goto done;
timestr = get_timestr(evlog->submit_time.tv_sec, 1);
timestr = get_timestr(evlog->event_time.tv_sec, 1);
sudo_lbuf_append_esc(lbuf, LBUF_ESC_CNTRL, "%s : %s : ",
timestr ? timestr : "invalid date", evlog->submituser);