* Thu Feb 10 2005 Dan Walsh <dwalsh@redhat.com> 1.21.15-5

- Trap failure on write
- Rewrite genhomedircon to generate file_context.homedirs
- several passes
This commit is contained in:
Daniel J Walsh 2005-02-11 05:56:10 +00:00
parent 93d1c9d780
commit 7500758a95
2 changed files with 6 additions and 5 deletions

View File

@ -1,6 +1,6 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.21.15/scripts/genhomedircon diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.21.15/scripts/genhomedircon
--- nsapolicycoreutils/scripts/genhomedircon 2005-01-28 11:16:36.000000000 -0500 --- nsapolicycoreutils/scripts/genhomedircon 2005-01-28 11:16:36.000000000 -0500
+++ policycoreutils-1.21.15/scripts/genhomedircon 2005-02-10 20:10:15.000000000 -0500 +++ policycoreutils-1.21.15/scripts/genhomedircon 2005-02-11 00:54:56.000000000 -0500
@@ -13,38 +13,109 @@ @@ -13,38 +13,109 @@
# #
# ASSUMPTIONS: # ASSUMPTIONS:
@ -200,7 +200,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
+ def getHomeDirContext(self, user, home, role): + def getHomeDirContext(self, user, home, role):
+ ret="\n\n#\n# Context for user %s\n#\n\n" % user + ret="\n\n#\n# Context for user %s\n#\n\n" % user
+ rc=commands.getstatusoutput("grep -e '^HOME_DIR' %s | sed -e 's|HOME_DIR|%s|' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (self.getHomeDirTemplate(), home, role, user)) + rc=commands.getstatusoutput("grep -e '^HOME_DIR' %s | sed -e 's|HOME_DIR|%s|' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (self.getHomeDirTemplate(), home, role, user))
+ return ret + rc[1] + return ret + rc[1] + "\n"
+ +
+ +
+ def genHomeDirContext(self): + def genHomeDirContext(self):
@ -235,7 +235,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
+ ret= self.heading() + ret= self.heading()
+ ret += self.getHomeRootContext() + ret += self.getHomeRootContext()
+ for h in self.getHomeDirs(): + for h in self.getHomeDirs():
+ ret += self.getHomeDirContext ("user_u" , h, "user") + ret += self.getHomeDirContext ("user_u" , h+'/[A-z0-9]*', "user")
+ ret += self.genHomeDirContext() + ret += self.genHomeDirContext()
+ return ret + return ret
+ +

View File

@ -2,7 +2,7 @@
Summary: SELinux policy core utilities. Summary: SELinux policy core utilities.
Name: policycoreutils Name: policycoreutils
Version: 1.21.15 Version: 1.21.15
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
@ -81,9 +81,10 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %{_sysconfdir}/sestatus.conf %config(noreplace) %{_sysconfdir}/sestatus.conf
%changelog %changelog
* Thu Feb 10 2005 Dan Walsh <dwalsh@redhat.com> 1.21.15-4 * Thu Feb 10 2005 Dan Walsh <dwalsh@redhat.com> 1.21.15-5
- Trap failure on write - Trap failure on write
- Rewrite genhomedircon to generate file_context.homedirs - Rewrite genhomedircon to generate file_context.homedirs
- several passes
* Thu Feb 10 2005 Dan Walsh <dwalsh@redhat.com> 1.21.15-1 * Thu Feb 10 2005 Dan Walsh <dwalsh@redhat.com> 1.21.15-1
- Update from NSA - Update from NSA