[ SEMANAGE ] Move seuser validation to proper place

[Ivan Gyurdiev <ivg2@cornell.edu>]

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

Moves seuser validation from commit_components into merge_components.
This is the logical place for it - it's:

1) after modules are loaded and all components merged
2) inside the attach-detach section where policy has not been written 
back to disk
3) still in policy_components.c, which is supposedly backend-independent 
code.

This should result in a speedup, because the policy does not need to be 
re-read in for the sake of seuser validation, which was occuring in 
commit(). Note that seuser validation is incomplete at this point, since 
MLS checks are not done.


[-- Attachment #2: libsemanage.move_seuser_vcheck.diff --]
[-- Type: text/x-patch, Size: 1712 bytes --]

diff -Naurp --exclude CVS --exclude ChangeLog --exclude VERSION old/libsemanage/src/policy_components.c new/libsemanage/src/policy_components.c
--- old/libsemanage/src/policy_components.c	2005-11-08 12:10:26.000000000 -0500
+++ new/libsemanage/src/policy_components.c	2005-11-09 17:48:32.000000000 -0500
@@ -63,6 +63,9 @@ typedef struct load_table {
 	int mode;
 } load_table_t;
 
+/* This function must be called AFTER all modules are loaded.
+ * Modules could be represented as a database, in which case
+ * they should be loaded first, before the other components. */
 int semanage_base_merge_components(
 	semanage_handle_t* handle) {
 
@@ -88,6 +91,7 @@ int semanage_base_merge_components(
 	load_handler_arg_t load_arg;
 	load_arg.handle = handle;
 
+	/* Merge components into policy (and validate) */
 	for (i = 0; i < CCOUNT; i++) {
 		dbase_config_t* from = components[i].from;
 		dbase_config_t* to = components[i].to;
@@ -106,6 +110,10 @@ int semanage_base_merge_components(
 			handle, from->dbase, load_handler, &load_arg) < 0) 
 			goto err;
 	}	
+
+	/* Validate seusers against policy */
+	if (semanage_seuser_validate(handle) < 0)
+		goto err;
 	
 	return STATUS_SUCCESS;
 
@@ -128,10 +136,6 @@ int semanage_commit_components(
 	};
 	const int CCOUNT = sizeof(components)/sizeof(components[0]);
 
-	/* Validate seusers */
-	if (semanage_seuser_validate(handle) < 0)
-		goto err;
-
 	for (i = 0; i < CCOUNT; i++) {
 		/* Flush to disk */
 		if (components[i]->dtable->flush(
@@ -139,7 +143,6 @@ int semanage_commit_components(
 			goto err;
 	}
 
-
 	/* Drop cache, because we're leaving transaction soon */
 	for (i=0; i < CCOUNT; i++)
 		components[i]->dtable->drop_cache(components[i]->dbase);