aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Lautrbach <plautrba@redhat.com>2019-02-06 20:41:11 +0100
committerNicolas Iooss <nicolas.iooss@m4x.org>2019-02-10 17:06:00 +0100
commit347719d15f61bc2952b2877035e9187e2c6d282f (patch)
treeeb18a3a97f6dda07cdf4bcd296e32048bec3908a
parent4634e8fe3986a8b5a196c662916c8a8553163c1b (diff)
downloadandroid_external_selinux-347719d15f61bc2952b2877035e9187e2c6d282f.tar.gz
android_external_selinux-347719d15f61bc2952b2877035e9187e2c6d282f.tar.bz2
android_external_selinux-347719d15f61bc2952b2877035e9187e2c6d282f.zip
libselinux/selinux_restorecon: Skip customized files also without -v
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@redhat.com> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
-rw-r--r--libselinux/src/selinux_restorecon.c2
1 files changed, 1 insertions, 1 deletions
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) {