[Selinux-commits] SF.net SVN: selinux: [2044] trunk/libsemanage

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

Revision: 2044
          http://svn.sourceforge.net/selinux/?rev=2044&view=rev
Author:   ssmalley
Date:     2006-09-29 08:33:28 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: libsemanage patch to handle installation problem
Date: Fri, 29 Sep 2006 10:43:34 -0400

During install if selinux-policy-mls or selinux-policy-strict get 
installed before targeted, libsemanage will
try to load those policies when it should not.

Dan

Modified Paths:
--------------
    trunk/libsemanage/ChangeLog
    trunk/libsemanage/src/semanage_store.c

Modified: trunk/libsemanage/ChangeLog
===================================================================
--- trunk/libsemanage/ChangeLog	2006-09-29 15:27:26 UTC (rev 2043)
+++ trunk/libsemanage/ChangeLog	2006-09-29 15:33:28 UTC (rev 2044)
@@ -1,3 +1,5 @@
+	* Merged patch to skip reload if no active store exists and
+	  the store path doesn't match the active store path from Dan Walsh.
 	* Merged patch to not destroy sepol handle on error path of
 	  connect from James Athey.
 	* Merged patch to add genhomedircon path to semanage.conf from

Modified: trunk/libsemanage/src/semanage_store.c
===================================================================
--- trunk/libsemanage/src/semanage_store.c	2006-09-29 15:27:26 UTC (rev 2043)
+++ trunk/libsemanage/src/semanage_store.c	2006-09-29 15:33:28 UTC (rev 2044)
@@ -1110,7 +1110,9 @@
 			/* They are not the same store */
 			goto skip_reload;
 		}
-	}
+	} else if (errno == ENOENT &&
+		   strcmp(really_active_store, storepath) != 0)
+		goto skip_reload;
 
 	if (semanage_reload_policy(sh)) {
 		goto cleanup;


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