diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 283d77f..aa755f1 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -585,7 +585,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow. + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.27.28/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2005-11-16 15:27:46.000000000 -0500 -+++ policycoreutils-1.27.28/scripts/genhomedircon 2005-11-16 22:33:25.000000000 -0500 ++++ policycoreutils-1.27.28/scripts/genhomedircon 2005-11-16 23:21:23.000000000 -0500 @@ -29,7 +29,9 @@ import commands, sys, os, pwd, string, getopt, re from semanage import *; @@ -597,7 +597,47 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po def getStartingUID(): starting_uid = sys.maxint -@@ -272,7 +274,7 @@ +@@ -63,12 +65,7 @@ + homedir = homedir.strip() + if not homedir in ret: + ret.append(homedir) +- else: +- #rc[0] == 256 means the file was there, we read it, but the grep didn't match +- if rc[0] != 256: +- sys.stderr.write("%s\n" % rc[1]) +- sys.stderr.write("You do not have access to /etc/default/useradd HOME=\n") +- sys.stderr.flush() ++ + rc=commands.getstatusoutput("grep -h '^LU_HOMEDIRECTORY' /etc/libuser.conf") + if rc[0] == 0: + homedir = rc[1].split("=")[1] +@@ -76,12 +73,7 @@ + homedir = homedir.strip() + if not homedir in ret: + ret.append(homedir) +- else: +- #rc[0] == 256 means the file was there, we read it, but the grep didn't match +- if rc[0] != 256: +- sys.stderr.write("%s\n" % rc[1]) +- sys.stderr.write("You do not have access to /etc/libuser.conf LU_HOMEDIRECTORY=\n") +- sys.stderr.flush() ++ + if ret == []: + ret.append("/home") + return ret +@@ -240,9 +232,8 @@ + if rc[0] == 0: + prefix_regex = rc[1].split("\n") + else: +- sys.stderr.write("%s\n" % rc[1]) +- sys.stderr.write("You do not have access to grep/cut/the file contexts\n") +- sys.stderr.flush() ++ warning("%s\nYou do not have access to read %s\n" % (rc[1], self.getFileContectFile())) ++ + exists=1 + for regex in prefix_regex: + #match a trailing (/*)? which is actually a bug in rpc_pipefs +@@ -272,7 +263,7 @@ ulist = pwd.getpwall() for u in ulist: if u[2] >= starting_uid and \