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

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

Revision: 2353
          http://svn.sourceforge.net/selinux/?rev=2353&view=rev
Author:   ssmalley
Date:     2007-04-13 07:11:28 -0700 (Fri, 13 Apr 2007)

Log Message:
-----------
Ported r2351 (libsepol: add boolmap argument to expand_module_avrules) from trunk.

Modified Paths:
--------------
    branches/stable/1_0/libsepol/ChangeLog
    branches/stable/1_0/libsepol/VERSION
    branches/stable/1_0/libsepol/include/sepol/policydb/expand.h
    branches/stable/1_0/libsepol/src/expand.c

Modified: branches/stable/1_0/libsepol/ChangeLog
===================================================================
--- branches/stable/1_0/libsepol/ChangeLog	2007-04-13 14:08:26 UTC (rev 2352)
+++ branches/stable/1_0/libsepol/ChangeLog	2007-04-13 14:11:28 UTC (rev 2353)
@@ -1,3 +1,6 @@
+1.16.3 2007-04-13
+	* Merged add boolmap argument to expand_module_avrules() from Chris PeBenito.
+
 1.16.2 2007-03-30
 	* Merged fix from Karl to remap booleans at expand time to 
 	  avoid holes in the symbol table.

Modified: branches/stable/1_0/libsepol/VERSION
===================================================================
--- branches/stable/1_0/libsepol/VERSION	2007-04-13 14:08:26 UTC (rev 2352)
+++ branches/stable/1_0/libsepol/VERSION	2007-04-13 14:11:28 UTC (rev 2353)
@@ -1 +1 @@
-1.16.2
+1.16.3

Modified: branches/stable/1_0/libsepol/include/sepol/policydb/expand.h
===================================================================
--- branches/stable/1_0/libsepol/include/sepol/policydb/expand.h	2007-04-13 14:08:26 UTC (rev 2352)
+++ branches/stable/1_0/libsepol/include/sepol/policydb/expand.h	2007-04-13 14:11:28 UTC (rev 2353)
@@ -30,17 +30,19 @@
 #include <sepol/policydb/conditional.h>
 
 /*
- * Expand only the avrules for a module. It is valid for this function to
- * expand base into itself (i.e.  base == out); the typemap for this special
- * case should map type[i] to i+1.  This function optionally expands neverallow
- * rules. If neverallow rules are expanded, there is no need to copy them and
- * doing so could cause duplicate entries when base == out. If the neverallow
- * rules are not expanded, they are just copied to the destination policy so
- * that assertion checking can be performed after expand. No assertion or
- * hierarchy checking is performed by this function.
+ * Expand only the avrules for a module. It is valid for this function
+ * to expand base into itself (i.e.  base == out); the typemap for
+ * this special case should map type[i] to i+1.  Likewise the boolmap
+ * should map bool[i] to i + 1.  This function optionally expands
+ * neverallow rules. If neverallow rules are expanded, there is no
+ * need to copy them and doing so could cause duplicate entries when
+ * base == out.  If the neverallow rules are not expanded, they are
+ * just copied to the destination policy so that assertion checking
+ * can be performed after expand.  No assertion or hierarchy checking
+ * is performed by this function.
  */
 extern int expand_module_avrules(sepol_handle_t * handle, policydb_t * base,
-				 policydb_t * out, uint32_t * typemap,
+				 policydb_t * out, uint32_t * typemap, uint32_t * boolmap,
 				 int verbose, int expand_neverallow);
 /*
  * Expand all parts of a module. Neverallow rules are not expanded (only

Modified: branches/stable/1_0/libsepol/src/expand.c
===================================================================
--- branches/stable/1_0/libsepol/src/expand.c	2007-04-13 14:08:26 UTC (rev 2352)
+++ branches/stable/1_0/libsepol/src/expand.c	2007-04-13 14:11:28 UTC (rev 2353)
@@ -2197,7 +2197,8 @@
  * or expand into the same policy for analysis purposes.
  */
 int expand_module_avrules(sepol_handle_t * handle, policydb_t * base,
-			  policydb_t * out, uint32_t * typemap, int verbose,
+			  policydb_t * out, uint32_t * typemap,
+			  uint32_t * boolmap, int verbose,
 			  int expand_neverallow)
 {
 	expand_state_t state;
@@ -2207,6 +2208,7 @@
 	state.base = base;
 	state.out = out;
 	state.typemap = typemap;
+	state.boolmap = boolmap;
 	state.handle = handle;
 	state.verbose = verbose;
 	state.expand_neverallow = expand_neverallow;


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