* Wed Nov 9 2005 Dan Walsh <dwalsh@redhat.com> 1.27.26-4

- Fix genhomedircon to use seusers file, temporary fix until swigified semanage
This commit is contained in:
Daniel J Walsh 2005-11-09 22:43:40 +00:00
parent 77fc72c7ad
commit 0bfa56ba19
2 changed files with 17 additions and 4 deletions

View File

@ -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 16:08:15.000000000 -0500 +++ policycoreutils-1.27.26/scripts/genhomedircon 2005-11-09 17:42:11.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.
@ -267,7 +267,18 @@ 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 +298,6 @@ @@ -362,9 +182,8 @@
return ret + rc[1] + "\n"
def getUserContext(self, user, sel_user, role):
- ret="\n\n#\n# Other Context for user %s\n#\n\n" % user
rc=commands.getstatusoutput("grep 'USER' %s | sed -e 's/USER/%s/' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (self.getHomeDirTemplate(), user, role, sel_user))
- return ret + rc[1] + "\n"
+ return rc[1] + "\n"
def genHomeDirContext(self):
users = self.getUsers()
@@ -478,10 +297,6 @@
if type==None: if type==None:
type=getSELinuxType(directory) type=getSELinuxType(directory)

View File

@ -3,10 +3,11 @@
Summary: SELinux policy core utilities. Summary: SELinux policy core utilities.
Name: policycoreutils Name: policycoreutils
Version: 1.27.26 Version: 1.27.26
Release: 3 Release: 4
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
Patch: policycoreutils-rhat.patch
BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever}
@ -33,6 +34,7 @@ context.
%prep %prep
%setup -q %setup -q
%patch -p1 -b .rhat
%build %build
make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all
@ -86,7 +88,7 @@ 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-3 * Wed Nov 9 2005 Dan Walsh <dwalsh@redhat.com> 1.27.26-4
- Fix genhomedircon to use seusers file, temporary fix until swigified semanage - 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