[Selinux-commits] SF.net SVN: selinux: [2151] trunk/policycoreutils

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

Revision: 2151
          http://svn.sourceforge.net/selinux/?rev=2151&view=rev
Author:   ssmalley
Date:     2007-01-05 11:13:58 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: Policycoreutils patches
Date: Thu, 04 Jan 2007 17:07:56 -0500

Ok this part of the seobject patch should not be controversial.

This patch fixes modification of roles.
>   

Modified Paths:
--------------
    trunk/policycoreutils/ChangeLog
    trunk/policycoreutils/VERSION
    trunk/policycoreutils/semanage/seobject.py

Modified: trunk/policycoreutils/ChangeLog
===================================================================
--- trunk/policycoreutils/ChangeLog	2007-01-05 14:46:02 UTC (rev 2150)
+++ trunk/policycoreutils/ChangeLog	2007-01-05 19:13:58 UTC (rev 2151)
@@ -1,3 +1,6 @@
+1.33.9 2007-01-05
+	* Merged patch to fix seobject role modification from Dan Walsh.
+
 1.33.8 2007-01-04
 	* Merged patches from Dan Walsh to:
 	  - omit the optional name from audit2allow

Modified: trunk/policycoreutils/VERSION
===================================================================
--- trunk/policycoreutils/VERSION	2007-01-05 14:46:02 UTC (rev 2150)
+++ trunk/policycoreutils/VERSION	2007-01-05 19:13:58 UTC (rev 2151)
@@ -1 +1 @@
-1.33.8
+1.33.9

Modified: trunk/policycoreutils/semanage/seobject.py
===================================================================
--- trunk/policycoreutils/semanage/seobject.py	2007-01-05 14:46:02 UTC (rev 2150)
+++ trunk/policycoreutils/semanage/seobject.py	2007-01-05 19:13:58 UTC (rev 2151)
@@ -525,8 +525,12 @@
 				semanage_user_set_prefix(self.sh, u, prefix)
 
 			if len(roles) != 0:
-				for r in roles:
-					semanage_user_add_role(self.sh, u, r)
+                               for r in rlist:
+                                      if r not in roles:
+                                             semanage_user_del_role(u, r)
+                               for r in roles:
+                                      if r not in rlist:
+                                             semanage_user_add_role(self.sh, u, r)
 
 			rc = semanage_begin_transaction(self.sh)
 			if rc < 0:


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