shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

executor: apply LogLevelMax earlier

Browse Source 
SELinux logs before we have a chance to apply it, move it up as it
breaks TEST-04-JOURNAL:

[  408.578624] testsuite-04.sh[11463]: ++ journalctl -b -q -u silent-success.service
[  408.578743] testsuite-04.sh[11098]: + [[ -z Dec 03 13:38:41 H systemd-executor[11459]: SELinux enabled state cached to: disabled ]]

Follow-up for: bb5232b6a3
This commit is contained in:
Luca Boccassi 2023-12-03 18:30:07 +00:00 committed by Yu Watanabe
parent b88f0fdc87
commit cc9f4cad8c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/exec-invoke.c
View File

@ -3976,6 +3976,9 @@ int exec_invoke(
assert(params);
assert(exit_status);
if (context->log_level_max >= 0)
log_set_max_level(context->log_level_max);
/* Explicitly test for CVE-2021-4034 inspired invocations */
if (!command->path || strv_isempty(command->argv)) {
*exit_status = EXIT_EXEC;
@ -4038,8 +4041,6 @@ int exec_invoke(
log_forget_fds();
log_set_open_when_needed(true);
log_settle_target();
if (context->log_level_max >= 0)
log_set_max_level(context->log_level_max);
/* In case anything used libc syslog(), close this here, too */
closelog();