* [PATCH] restorecond: Do not ignore the -f option
@ 2018-10-03 15:50 Ondrej Mosnacek
2018-10-03 18:05 ` Jason Zaman
0 siblings, 1 reply; 2+ messages in thread
From: Ondrej Mosnacek @ 2018-10-03 15:50 UTC (permalink / raw)
To: selinux
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/restorecond.c
+++ b/restorecond/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.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] restorecond: Do not ignore the -f option
2018-10-03 15:50 [PATCH] restorecond: Do not ignore the -f option Ondrej Mosnacek
@ 2018-10-03 18:05 ` Jason Zaman
0 siblings, 0 replies; 2+ messages in thread
From: Jason Zaman @ 2018-10-03 18:05 UTC (permalink / raw)
To: Ondrej Mosnacek; +Cc: SELinux ML
[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]
Ack. (sorry for the HTML email)
On Wed, 3 Oct 2018, 23:52 Ondrej Mosnacek, <omosnace@redhat.com> wrote:
> 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/restorecond.c
> +++ b/restorecond/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.17.1
>
> _______________________________________________
> Selinux mailing list
> Selinux@tycho.nsa.gov
> To unsubscribe, send email to Selinux-leave@tycho.nsa.gov.
> To get help, send an email containing "help" to
> Selinux-request@tycho.nsa.gov.
>
[-- Attachment #2: Type: text/html, Size: 2344 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-03 18:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-03 15:50 [PATCH] restorecond: Do not ignore the -f option Ondrej Mosnacek
2018-10-03 18:05 ` Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).