-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/I+EEACgkQrlYvE4MpobPwgwCgp0ym0Y+cTvqmyIbahDIn3vl/ PRAAn2PUn46PyJyEj+qhe0stomsyemxN =E8cF -----END PGP SIGNATURE-----
>From c1775eeb69e4bda355c35a48acbd60637ecf4942 Mon Sep 17 00:00:00 2001 From: Russell Coker <russell@xxxxxxxxxxxx> Date: Mon, 26 Mar 2012 17:45:49 +0200 Subject: [PATCH 28/90] policycoreutils: Make restorecon return 0 when a file has changed context with no error FIXME restorecon should return 0 when a file has changed context with no error. With the last version it's returning 1. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662990 [This needs review as the original patch from Russel always returned 0 in the out: case. Even for errors...] Signed-off-by: Laurent Bigonville <bigon@xxxxxxxxxx> Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- policycoreutils/setfiles/restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policycoreutils/setfiles/restore.c b/policycoreutils/setfiles/restore.c index 51020de..e24b100 100644 --- a/policycoreutils/setfiles/restore.c +++ b/policycoreutils/setfiles/restore.c @@ -258,7 +258,7 @@ static int restore(FTSENT *ftsent) r_opts->progname, my_file, newcon, strerror(errno)); goto skip; } - ret = 1; + ret = 0; out: freecon(curcon); freecon(newcon); -- 1.7.10.2
