41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
From 385ef2cdc679fdc79f0876f544c6e555ae9f59dc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ondrej Mosnacek <omosnace@redhat.com>
|
||
|
|
Date: Wed, 3 Oct 2018 16:42:59 +0200
|
||
|
|
Subject: [PATCH 064/170] restorecond: Do not ignore the -f option
|
||
|
|
|
||
|
|
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: 48681bb49c03 ("policycoreutils: restorecond: make restorecond dbuss-able")
|
||
|
|
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
|
||
|
|
---
|
||
|
|
restorecond/restorecond.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/restorecond/restorecond.c b/restorecond/restorecond.c
|
||
|
|
index e1d26cb9..7b984b29 100644
|
||
|
|
--- a/restorecond-2.8/restorecond.c
|
||
|
|
+++ b/restorecond-2.8/restorecond.c
|
||
|
|
@@ -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) {
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|