RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-24 23:12:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

restorecond: Do not ignore the -f option

Browse Source 
Since the default value of watch_file is set unconditionally *after* the
command-line arguments have been parsed, the -f option is (and has
always been) effectively ignored. Fix this by setting it before the
parsing.

Fixes: 48681bb49c ("policycoreutils: restorecond: make restorecond dbuss-able")
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
This commit is contained in:
Ondrej Mosnacek 2018-10-03 16:42:59 +02:00 committed by William Roberts
parent e5f312667b
commit 385ef2cdc6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
restorecond/restorecond.c
View File

@ -148,6 +148,8 @@ int main(int argc, char **argv)
if (is_selinux_enabled() != 1)
return 0;
watch_file = server_watch_file;
/* Set all options to zero/NULL except for ignore_noent & digest. */
memset(&r_opts, 0, sizeof(r_opts));
r_opts.ignore_noent = SELINUX_RESTORECON_IGNORE_NOENTRY;
@ -205,7 +207,6 @@ int main(int argc, char **argv)
return 0;
}
watch_file = server_watch_file;
read_config(master_fd, watch_file);
if (!debug_mode) {