ae679f38bf
- Update to upstream * Merged fix warnings patch from Karl MacMillan. * Merged patch from Dan Walsh. This includes audit2allow changes for analysis plugins, internationalization support for several additional programs and added po files, some fixes for semanage, and several cleanups. It also adds a new secon utility.
22 lines
1.3 KiB
Diff
22 lines
1.3 KiB
Diff
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.8/scripts/genhomedircon
|
|
--- nsapolicycoreutils/scripts/genhomedircon 2006-05-08 11:01:21.000000000 -0400
|
|
+++ policycoreutils-1.30.8/scripts/genhomedircon 2006-05-08 11:19:02.000000000 -0400
|
|
@@ -283,7 +283,7 @@
|
|
fd = open(self.getFileContextFile())
|
|
for i in fd.read().split('\n'):
|
|
if len(i) == 0:
|
|
- return
|
|
+ continue
|
|
regex = i.split()[0]
|
|
#match a trailing .+
|
|
regex = re.sub("\.+$", "", regex)
|
|
@@ -309,7 +309,7 @@
|
|
homedir = u[5][:string.rfind(u[5], "/")]
|
|
if not homedir in homedirs:
|
|
if self.checkExists(homedir) == 1:
|
|
- warning("%s homedir %s or its parent directory conflicts with a\ndefined context in %s,\n%s will not create a new context." % (u[0], u[5], self.getFileContextFile(), sys.argv[0]))
|
|
+ warning("%s homedir %s or its parent directory conflicts with a\ndefined context in %s,\n%s will not create a new context. This usually indicates an incorrectly defined system account. If it is a system account please make sure its login shell is /sbin/nologin." % (u[0], u[5], self.getFileContextFile(), sys.argv[0]))
|
|
else:
|
|
homedirs.append(homedir)
|
|
|