On Thu, Feb 7, 2019 at 10:23 PM Nicolas Iooss <nicolas.iooss@xxxxxxx> wrote:
>
> On Wed, Feb 6, 2019 at 8:41 PM Petr Lautrbach <plautrba@xxxxxxxxxx> wrote:
> >
> > In the original code, customizable file contexts were not changed only if -v was
> > used. It lead to different behavior when selinux_restorecon was run with -v and
> > without it.
> >
> > Based on an initial patch by Jan Zarsky <jzarsky@xxxxxxxxxx>
> >
> > Signed-off-by: Petr Lautrbach <plautrba@xxxxxxxxxx>
>
> Acked-by: Nicolas Iooss <nicolas.iooss@xxxxxxx>
Merged.
Nicolas
> > ---
> > libselinux/src/selinux_restorecon.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libselinux/src/selinux_restorecon.c b/libselinux/src/selinux_restorecon.c
> > index 42a48f5a..0f0fd6ca 100644
> > --- a/libselinux/src/selinux_restorecon.c
> > +++ b/libselinux/src/selinux_restorecon.c
> > @@ -672,8 +672,8 @@ static int restorecon_sb(const char *pathname, const struct stat *sb,
> > selinux_log(SELINUX_INFO,
> > "%s not reset as customized by admin to %s\n",
> > pathname, curcon);
> > - goto out;
> > }
> > + goto out;
> > }
> >
> > if (!flags->set_specctx && curcon) {
> > --
> > 2.20.1
> >
