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

Store runenv in the I/O log info file too.

Browse Source
This commit is contained in:
Todd C. Miller
2020-03-29 05:05:08 -06:00
parent 056173e572
commit 9b144069fc
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
logsrvd/iolog_writer.c
View File

@@ -124,6 +124,11 @@ iolog_details_free(struct iolog_details *details)
for (i = 0; i < details->argc; i++) for (i = 0; i < details->argc; i++)
free(details->argv[i]); free(details->argv[i]);
free(details->argv); free(details->argv);
if (details->envp != NULL) {
for (i = 0; details->envp[i] != NULL; i++)
free(details->envp[i]);
free(details->envp);
}
} }
debug_return; debug_return;
@@ -214,6 +219,17 @@ iolog_details_fill(struct iolog_details *details, TimeSpec *submit_time,
} }
continue; continue;
} }
if (strcmp(key, "runenv") == 0) {
if (has_strlistval(info)) {
details->envp = strlist_copy(info->strlistval);
if (details->envp == NULL)
goto done;
} else {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"runenv specified but not a string list");
}
continue;
}
if (strcmp(key, "rungid") == 0) { if (strcmp(key, "rungid") == 0) {
if (!has_numval(info)) { if (!has_numval(info)) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
@@ -629,6 +645,7 @@ iolog_details_write(struct iolog_details *details,
log_info.runas_uid = details->runuid; log_info.runas_uid = details->runuid;
log_info.runas_gid = details->rungid; log_info.runas_gid = details->rungid;
log_info.argv = details->argv; log_info.argv = details->argv;
log_info.envp = details->envp;
debug_return_bool(iolog_write_info_file(closure->iolog_dir_fd, debug_return_bool(iolog_write_info_file(closure->iolog_dir_fd,
details->iolog_path, &log_info)); details->iolog_path, &log_info));

1
logsrvd/logsrvd.h
View File

@@ -59,6 +59,7 @@ struct iolog_details {
char *ttyname; char *ttyname;
char **argv; char **argv;
char **env_add; char **env_add;
char **envp;
struct timespec submit_time; struct timespec submit_time;
int argc; int argc;
int lines; int lines;