* Fri Feb 24 2005 Dan Walsh <dwalsh@redhat.com> 1.21.20-2
- Fix genhomedircon to handle blank users
This commit is contained in:
parent
12b6a62a7a
commit
e4e544ece9
@ -20,3 +20,24 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/load_policy/load_policy.
|
||||
data = map;
|
||||
data_size = sb.st_size;
|
||||
}
|
||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.21.20/scripts/genhomedircon
|
||||
--- nsapolicycoreutils/scripts/genhomedircon 2005-02-25 09:16:14.000000000 -0500
|
||||
+++ policycoreutils-1.21.20/scripts/genhomedircon 2005-02-25 15:08:14.183581120 -0500
|
||||
@@ -222,7 +222,7 @@
|
||||
users=""
|
||||
rc = commands.getstatusoutput('grep "^user" %s' % self.getSystemUsersFile())
|
||||
if rc[0] == 0:
|
||||
- users+=rc[1]+"\n"
|
||||
+ users+=rc[1]
|
||||
rc = commands.getstatusoutput("grep ^user %s" % self.getUsersFile())
|
||||
if rc[0] == 0:
|
||||
users+=rc[1]
|
||||
@@ -233,7 +233,7 @@
|
||||
for u in ulist:
|
||||
user = u.split()
|
||||
try:
|
||||
- if user[1] == "user_u" or user[1] == "system_u":
|
||||
+ if len(user)==0 or user[1] == "user_u" or user[1] == "system_u":
|
||||
continue
|
||||
# !!! chooses first role in the list to use in the file context !!!
|
||||
role = user[3]
|
||||
|
@ -1,9 +1,9 @@
|
||||
%define libselinuxver 1.21.10-1
|
||||
%define libsepolver 1.3.6-2
|
||||
%define libsepolver 1.3.6-3
|
||||
Summary: SELinux policy core utilities.
|
||||
Name: policycoreutils
|
||||
Version: 1.21.20
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: GPL
|
||||
Group: System Environment/Base
|
||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||
@ -82,6 +82,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%config(noreplace) %{_sysconfdir}/sestatus.conf
|
||||
|
||||
%changelog
|
||||
* Fri Feb 24 2005 Dan Walsh <dwalsh@redhat.com> 1.21.20-2
|
||||
- Fix genhomedircon to handle blank users
|
||||
|
||||
* Fri Feb 24 2005 Dan Walsh <dwalsh@redhat.com> 1.21.20-1
|
||||
- Update to latest from NSA
|
||||
- Add call to libsepol
|
||||
|
Loading…
Reference in New Issue
Block a user