[Selinux-commits] SF.net SVN: selinux: [2534] branches/stable/1_0/policycoreutils

[<ssm...@us...>]

Revision: 2534
          http://selinux.svn.sourceforge.net/selinux/?rev=2534&view=rev
Author:   ssmalley
Date:     2007-08-23 07:54:42 -0700 (Thu, 23 Aug 2007)

Log Message:
-----------
Fix genhomedircon matching of USER template from Todd Miller.
Fix chcat from Dan Walsh.

Modified Paths:
--------------
    branches/stable/1_0/policycoreutils/ChangeLog
    branches/stable/1_0/policycoreutils/VERSION
    branches/stable/1_0/policycoreutils/scripts/chcat
    branches/stable/1_0/policycoreutils/scripts/genhomedircon

Modified: branches/stable/1_0/policycoreutils/ChangeLog
===================================================================
--- branches/stable/1_0/policycoreutils/ChangeLog	2007-08-23 14:50:08 UTC (rev 2533)
+++ branches/stable/1_0/policycoreutils/ChangeLog	2007-08-23 14:54:42 UTC (rev 2534)
@@ -1,3 +1,7 @@
+1.34.11 2007-08-23
+	* Fix genhomedircon matching of the USER template from Todd Miller.
+	* Fix chcat from Dan Walsh.
+
 1.34.10 2007-05-09
 	* Merged genhomedircon fix to find conflicting directories correctly from Dan Walsh.
 

Modified: branches/stable/1_0/policycoreutils/VERSION
===================================================================
--- branches/stable/1_0/policycoreutils/VERSION	2007-08-23 14:50:08 UTC (rev 2533)
+++ branches/stable/1_0/policycoreutils/VERSION	2007-08-23 14:54:42 UTC (rev 2534)
@@ -1 +1 @@
-1.34.10
+1.34.11

Modified: branches/stable/1_0/policycoreutils/scripts/chcat
===================================================================
--- branches/stable/1_0/policycoreutils/scripts/chcat	2007-08-23 14:50:08 UTC (rev 2533)
+++ branches/stable/1_0/policycoreutils/scripts/chcat	2007-08-23 14:54:42 UTC (rev 2534)
@@ -77,7 +77,7 @@
             
         if len(cats) > 0:
             new_serange = "%s-%s:%s" % (serange[0], top[0], ",".join(cats))
-        else
+        else:
             new_serange = "%s-%s" % (serange[0], top[0])
             
         if add_ind:
@@ -155,7 +155,7 @@
 
         if len(cats) > 0:
             new_serange = "%s-%s:%s" % (serange[0], top[0], ",".join(cats))
-        else
+        else:
             new_serange = "%s-%s" % (serange[0], top[0])
             
         if add_ind:

Modified: branches/stable/1_0/policycoreutils/scripts/genhomedircon
===================================================================
--- branches/stable/1_0/policycoreutils/scripts/genhomedircon	2007-08-23 14:50:08 UTC (rev 2533)
+++ branches/stable/1_0/policycoreutils/scripts/genhomedircon	2007-08-23 14:54:42 UTC (rev 2534)
@@ -272,7 +272,7 @@
 		ret = ""
 		fd = open(self.getHomeDirTemplate(), 'r')
 		for i in  fd.readlines():
-			if i.find("USER") == 1:
+			if i.find("USER") >= 0:
 				i = i.replace("USER", user)
 				i = i.replace("ROLE", prefix)
 				i = i.replace("system_u", sel_user)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.