* Sun May 7 2006 Dan Walsh <dwalsh@redhat.com> 1.30.6-5
- Fix genhomedircon to catch duplicate homedir problem
This commit is contained in:
parent
2707e1ea48
commit
30138b6e42
@ -70352,7 +70352,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycore
|
|||||||
errors += chcat_add(c[1:],translate(l), objects, login_ind)
|
errors += chcat_add(c[1:],translate(l), objects, login_ind)
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.6/scripts/genhomedircon
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.6/scripts/genhomedircon
|
||||||
--- nsapolicycoreutils/scripts/genhomedircon 2006-02-16 13:35:28.000000000 -0500
|
--- nsapolicycoreutils/scripts/genhomedircon 2006-02-16 13:35:28.000000000 -0500
|
||||||
+++ policycoreutils-1.30.6/scripts/genhomedircon 2006-04-29 01:44:38.000000000 -0400
|
+++ policycoreutils-1.30.6/scripts/genhomedircon 2006-05-07 07:04:17.000000000 -0400
|
||||||
@@ -26,10 +26,11 @@
|
@@ -26,10 +26,11 @@
|
||||||
|
|
||||||
import sys, os, pwd, string, getopt, re
|
import sys, os, pwd, string, getopt, re
|
||||||
@ -70503,7 +70503,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
|
|||||||
if prefix == "{":
|
if prefix == "{":
|
||||||
prefix = user[4]
|
prefix = user[4]
|
||||||
if len(prefix) > 2 and (prefix[-2:] == "_r" or prefix[-2:] == "_u"):
|
if len(prefix) > 2 and (prefix[-2:] == "_r" or prefix[-2:] == "_u"):
|
||||||
@@ -201,7 +202,7 @@
|
@@ -201,14 +202,14 @@
|
||||||
if home == "/":
|
if home == "/":
|
||||||
# Probably install so hard code to /root
|
# Probably install so hard code to /root
|
||||||
if user == "root":
|
if user == "root":
|
||||||
@ -70512,6 +70512,14 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
|
|||||||
else:
|
else:
|
||||||
return
|
return
|
||||||
except KeyError:
|
except KeyError:
|
||||||
|
if user == "root":
|
||||||
|
home = "/root"
|
||||||
|
else:
|
||||||
|
- sys.stderr.write("The user \"%s\" is not present in the passwd file, skipping...\n" % user)
|
||||||
|
+ sys.stderr.write(_("The user \"%s\" is not present in the passwd file, skipping...\n") % user)
|
||||||
|
return
|
||||||
|
prefs = {}
|
||||||
|
prefs["seuser"] = seuser
|
||||||
@@ -221,22 +222,22 @@
|
@@ -221,22 +222,22 @@
|
||||||
if self.semanaged:
|
if self.semanaged:
|
||||||
(status, list) = semanage_seuser_list(self.semanageHandle)
|
(status, list) = semanage_seuser_list(self.semanageHandle)
|
||||||
@ -70594,9 +70602,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
|
|||||||
+ fd = open(self.getFileContextFile())
|
+ fd = open(self.getFileContextFile())
|
||||||
for i in fd.read().split('\n'):
|
for i in fd.read().split('\n'):
|
||||||
- if len(i)==0:
|
- if len(i)==0:
|
||||||
+ if len(i) == 0:
|
- return
|
||||||
return
|
|
||||||
- regex=i.split()[0]
|
- regex=i.split()[0]
|
||||||
|
+ if len(i) == 0:
|
||||||
|
+ continue
|
||||||
+ regex = i.split()[0]
|
+ regex = i.split()[0]
|
||||||
#match a trailing .+
|
#match a trailing .+
|
||||||
regex = re.sub("\.+$", "", regex)
|
regex = re.sub("\.+$", "", regex)
|
||||||
@ -70612,15 +70621,17 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
|
|||||||
return homedirs
|
return homedirs
|
||||||
ulist = pwd.getpwall()
|
ulist = pwd.getpwall()
|
||||||
for u in ulist:
|
for u in ulist:
|
||||||
@@ -307,7 +308,7 @@
|
@@ -307,8 +308,8 @@
|
||||||
string.count(u[5], "/") > 1:
|
string.count(u[5], "/") > 1:
|
||||||
homedir = u[5][:string.rfind(u[5], "/")]
|
homedir = u[5][:string.rfind(u[5], "/")]
|
||||||
if not homedir in homedirs:
|
if not homedir in homedirs:
|
||||||
- if self.checkExists(homedir)==1:
|
- 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]))
|
||||||
+ if self.checkExists(homedir) == 1:
|
+ 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:
|
else:
|
||||||
homedirs.append(homedir)
|
homedirs.append(homedir)
|
||||||
|
|
||||||
@@ -316,7 +317,7 @@
|
@@ -316,7 +317,7 @@
|
||||||
return homedirs
|
return homedirs
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
Summary: SELinux policy core utilities.
|
Summary: SELinux policy core utilities.
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 1.30.6
|
Version: 1.30.6
|
||||||
Release: 4
|
Release: 5
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||||
@ -110,6 +110,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
[ -x /sbin/service ] && /sbin/service restorecond condrestart
|
[ -x /sbin/service ] && /sbin/service restorecond condrestart
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun May 7 2006 Dan Walsh <dwalsh@redhat.com> 1.30.6-5
|
||||||
|
- Fix genhomedircon to catch duplicate homedir problem
|
||||||
|
|
||||||
* Thu May 4 2006 Dan Walsh <dwalsh@redhat.com> 1.30.6-4
|
* Thu May 4 2006 Dan Walsh <dwalsh@redhat.com> 1.30.6-4
|
||||||
- Add secon program
|
- Add secon program
|
||||||
- Add translations
|
- Add translations
|
||||||
|
Loading…
Reference in New Issue
Block a user