* Wed Nov 9 2005 Dan Walsh <dwalsh@redhat.com> 1.27.26-3
- Fix genhomedircon to use seusers file, temporary fix until swigified semanage
This commit is contained in:
parent
54ecf23b9a
commit
77fc72c7ad
@ -1,6 +1,6 @@
|
|||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.27.26/scripts/genhomedircon
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.27.26/scripts/genhomedircon
|
||||||
--- nsapolicycoreutils/scripts/genhomedircon 2005-09-12 16:33:30.000000000 -0400
|
--- nsapolicycoreutils/scripts/genhomedircon 2005-09-12 16:33:30.000000000 -0400
|
||||||
+++ policycoreutils-1.27.26/scripts/genhomedircon 2005-11-09 14:11:49.000000000 -0500
|
+++ policycoreutils-1.27.26/scripts/genhomedircon 2005-11-09 16:08:15.000000000 -0500
|
||||||
@@ -15,30 +15,16 @@
|
@@ -15,30 +15,16 @@
|
||||||
# The file CONTEXTDIR/files/homedir_template exists. This file is used to
|
# The file CONTEXTDIR/files/homedir_template exists. This file is used to
|
||||||
# set up the home directory context for each real user.
|
# set up the home directory context for each real user.
|
||||||
@ -230,7 +230,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
|
|||||||
if rc[0] == 0:
|
if rc[0] == 0:
|
||||||
users+=rc[1]
|
users+=rc[1]
|
||||||
udict = {}
|
udict = {}
|
||||||
@@ -336,24 +153,24 @@
|
@@ -336,24 +153,27 @@
|
||||||
if users != "":
|
if users != "":
|
||||||
ulist = users.split("\n")
|
ulist = users.split("\n")
|
||||||
for u in ulist:
|
for u in ulist:
|
||||||
@ -240,7 +240,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
|
|||||||
+ user = u.split(":")
|
+ user = u.split(":")
|
||||||
try:
|
try:
|
||||||
- if len(user)==0 or user[1] == "user_u" or user[1] == "system_u":
|
- if len(user)==0 or user[1] == "user_u" or user[1] == "system_u":
|
||||||
+ if len(user)==0 or user[1] == "user_u" or user[1] == "root":
|
+ if len(user)==0 or user[1] == "user_u":
|
||||||
continue
|
continue
|
||||||
# !!! chooses first role in the list to use in the file context !!!
|
# !!! chooses first role in the list to use in the file context !!!
|
||||||
- role = user[3]
|
- role = user[3]
|
||||||
@ -248,7 +248,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
|
|||||||
- role = user[4]
|
- role = user[4]
|
||||||
- role = role.split("_r")[0]
|
- role = role.split("_r")[0]
|
||||||
- home = pwd.getpwnam(user[1])[5]
|
- home = pwd.getpwnam(user[1])[5]
|
||||||
+ role = user[1]
|
+ if user[0] == "root":
|
||||||
|
+ role="user_u"
|
||||||
|
+ else:
|
||||||
|
+ role = user[1]
|
||||||
+ role = role.split("_u")[0]
|
+ role = role.split("_u")[0]
|
||||||
+ home = pwd.getpwnam(user[0])[5]
|
+ home = pwd.getpwnam(user[0])[5]
|
||||||
if home == "/":
|
if home == "/":
|
||||||
@ -264,7 +267,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
|
|||||||
return udict
|
return udict
|
||||||
|
|
||||||
def getHomeDirContext(self, user, home, role):
|
def getHomeDirContext(self, user, home, role):
|
||||||
@@ -478,10 +295,6 @@
|
@@ -478,10 +298,6 @@
|
||||||
if type==None:
|
if type==None:
|
||||||
type=getSELinuxType(directory)
|
type=getSELinuxType(directory)
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
Summary: SELinux policy core utilities.
|
Summary: SELinux policy core utilities.
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 1.27.26
|
Version: 1.27.26
|
||||||
Release: 2
|
Release: 3
|
||||||
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
|
||||||
@ -86,8 +86,8 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%config(noreplace) %{_sysconfdir}/sestatus.conf
|
%config(noreplace) %{_sysconfdir}/sestatus.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Nov 9 2005 Dan Walsh <dwalsh@redhat.com> 1.27.26-2
|
* Wed Nov 9 2005 Dan Walsh <dwalsh@redhat.com> 1.27.26-3
|
||||||
- Fix genhomedircon to use seusers file
|
- Fix genhomedircon to use seusers file, temporary fix until swigified semanage
|
||||||
|
|
||||||
* Tue Nov 8 2005 Dan Walsh <dwalsh@redhat.com> 1.27.26-1
|
* Tue Nov 8 2005 Dan Walsh <dwalsh@redhat.com> 1.27.26-1
|
||||||
* Added -B (--build) option to semodule to force a rebuild.
|
* Added -B (--build) option to semodule to force a rebuild.
|
||||||
|
Loading…
Reference in New Issue
Block a user