shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-11 20:58:27 +03:00
Code

selinux: close stdin/stdout/stderr before loading selinux policy

Browse Source 
Let's make sure libselinux doesn't spew to stderr
This commit is contained in:
Lennart Poettering 2012-09-10 13:14:56 +02:00
parent 7762e02b17
commit 2f6f1bc30c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/main.c
View File

@ -1266,6 +1266,8 @@ int main(int argc, char *argv[]) {
} }
arg_running_as = MANAGER_SYSTEM; arg_running_as = MANAGER_SYSTEM;
make_null_stdio();
log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_JOURNAL : LOG_TARGET_JOURNAL_OR_KMSG); log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_JOURNAL : LOG_TARGET_JOURNAL_OR_KMSG);
if (!skip_setup) { if (!skip_setup) {
@ -1439,10 +1441,8 @@ int main(int argc, char *argv[]) {
/* Reset the console, but only if this is really init and we /* Reset the console, but only if this is really init and we
* are freshly booted */ * are freshly booted */
if (arg_running_as == MANAGER_SYSTEM && arg_action == ACTION_RUN) { if (arg_running_as == MANAGER_SYSTEM && arg_action == ACTION_RUN)
console_setup(getpid() == 1 && !skip_setup); console_setup(getpid() == 1 && !skip_setup);
make_null_stdio();
}
/* Open the logging devices, if possible and necessary */ /* Open the logging devices, if possible and necessary */
log_open(); log_open();

1
src/core/selinux-setup.c
View File

@ -79,7 +79,6 @@ int selinux_setup(bool *loaded_policy) {
/* Now load the policy */ /* Now load the policy */
before_load = now(CLOCK_MONOTONIC); before_load = now(CLOCK_MONOTONIC);
r = selinux_init_load_policy(&enforce); r = selinux_init_load_policy(&enforce);
if (r == 0) { if (r == 0) {
char timespan[FORMAT_TIMESPAN_MAX]; char timespan[FORMAT_TIMESPAN_MAX];
char *label; char *label;