| Message ID | 20190131194824.4944-2-plautrba@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] libselinux: set an appropriate errno in booleans.c | expand |
On Thu, Jan 31, 2019 at 8:48 PM Petr Lautrbach <plautrba@redhat.com> wrote: > > Signed-off-by: Petr Lautrbach <plautrba@redhat.com> Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org> > --- > libselinux/utils/matchpathcon.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libselinux/utils/matchpathcon.c b/libselinux/utils/matchpathcon.c > index 67e4a433..9756d7d9 100644 > --- a/libselinux/utils/matchpathcon.c > +++ b/libselinux/utils/matchpathcon.c > @@ -14,7 +14,7 @@ > static __attribute__ ((__noreturn__)) void usage(const char *progname) > { > fprintf(stderr, > - "usage: %s [-N] [-n] [-f file_contexts] [ -P policy_root_path ] [-p prefix] [-Vq] path...\n", > + "usage: %s [-V] [-N] [-n] [-m type] [-f file_contexts_file] [-p prefix] [-P policy_root_path] filepath...\n", > progname); > exit(1); > } > -- > 2.20.1 >
On Thu, Jan 31, 2019 at 11:02 PM Nicolas Iooss <nicolas.iooss@m4x.org> wrote: > > On Thu, Jan 31, 2019 at 8:48 PM Petr Lautrbach <plautrba@redhat.com> wrote: > > > > Signed-off-by: Petr Lautrbach <plautrba@redhat.com> > > Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org> Merged. Thanks Nicolas > > --- > > libselinux/utils/matchpathcon.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libselinux/utils/matchpathcon.c b/libselinux/utils/matchpathcon.c > > index 67e4a433..9756d7d9 100644 > > --- a/libselinux/utils/matchpathcon.c > > +++ b/libselinux/utils/matchpathcon.c > > @@ -14,7 +14,7 @@ > > static __attribute__ ((__noreturn__)) void usage(const char *progname) > > { > > fprintf(stderr, > > - "usage: %s [-N] [-n] [-f file_contexts] [ -P policy_root_path ] [-p prefix] [-Vq] path...\n", > > + "usage: %s [-V] [-N] [-n] [-m type] [-f file_contexts_file] [-p prefix] [-P policy_root_path] filepath...\n", > > progname); > > exit(1); > > } > > -- > > 2.20.1 > >
diff --git a/libselinux/utils/matchpathcon.c b/libselinux/utils/matchpathcon.c index 67e4a433..9756d7d9 100644 --- a/libselinux/utils/matchpathcon.c +++ b/libselinux/utils/matchpathcon.c @@ -14,7 +14,7 @@ static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, - "usage: %s [-N] [-n] [-f file_contexts] [ -P policy_root_path ] [-p prefix] [-Vq] path...\n", + "usage: %s [-V] [-N] [-n] [-m type] [-f file_contexts_file] [-p prefix] [-P policy_root_path] filepath...\n", progname); exit(1); }
Signed-off-by: Petr Lautrbach <plautrba@redhat.com> --- libselinux/utils/matchpathcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)