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

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

Revision: 2449
          http://svn.sourceforge.net/selinux/?rev=2449&view=rev
Author:   ssmalley
Date:     2007-05-31 11:28:27 -0700 (Thu, 31 May 2007)

Log Message:
-----------
updated checkpolicy to version 1.34.3

Modified Paths:
--------------
    branches/stable/1_0/checkpolicy/ChangeLog
    branches/stable/1_0/checkpolicy/VERSION
    branches/stable/1_0/checkpolicy/checkmodule.8
    branches/stable/1_0/checkpolicy/checkpolicy.8
    branches/stable/1_0/checkpolicy/module_compiler.c

Modified: branches/stable/1_0/checkpolicy/ChangeLog
===================================================================
--- branches/stable/1_0/checkpolicy/ChangeLog	2007-05-31 18:11:53 UTC (rev 2448)
+++ branches/stable/1_0/checkpolicy/ChangeLog	2007-05-31 18:28:27 UTC (rev 2449)
@@ -1,3 +1,7 @@
+1.34.3 2007-05-31
+	* Merged fix for segfault on duplicate require of sensitivity from Caleb Case.
+	* Merged fix for dead URLs in checkpolicy man pages from Dan Walsh.
+
 1.34.2 2007-04-12
 	* Merged checkmodule man page fix from Dan Walsh.
 

Modified: branches/stable/1_0/checkpolicy/VERSION
===================================================================
--- branches/stable/1_0/checkpolicy/VERSION	2007-05-31 18:11:53 UTC (rev 2448)
+++ branches/stable/1_0/checkpolicy/VERSION	2007-05-31 18:28:27 UTC (rev 2449)
@@ -1 +1 @@
-1.34.2
+1.34.3

Modified: branches/stable/1_0/checkpolicy/checkmodule.8
===================================================================
--- branches/stable/1_0/checkpolicy/checkmodule.8	2007-05-31 18:11:53 UTC (rev 2448)
+++ branches/stable/1_0/checkpolicy/checkmodule.8	2007-05-31 18:28:27 UTC (rev 2449)
@@ -47,7 +47,7 @@
 
 .SH "SEE ALSO"
 .B semodule(8), semodule_package(8)
-SELinux documentation at http://www.nsa.gov/selinux/docs.html,
+SELinux documentation at http://www.nsa.gov/selinux,
 especially "Configuring the SELinux Policy".
 
 

Modified: branches/stable/1_0/checkpolicy/checkpolicy.8
===================================================================
--- branches/stable/1_0/checkpolicy/checkpolicy.8	2007-05-31 18:11:53 UTC (rev 2448)
+++ branches/stable/1_0/checkpolicy/checkpolicy.8	2007-05-31 18:28:27 UTC (rev 2449)
@@ -34,7 +34,7 @@
 Specify the policy version, defaults to the latest.
 
 .SH "SEE ALSO"
-SELinux documentation at http://www.nsa.gov/selinux/docs.html,
+SELinux documentation at http://www.nsa.gov/selinux,
 especially "Configuring the SELinux Policy".
 
 

Modified: branches/stable/1_0/checkpolicy/module_compiler.c
===================================================================
--- branches/stable/1_0/checkpolicy/module_compiler.c	2007-05-31 18:11:53 UTC (rev 2448)
+++ branches/stable/1_0/checkpolicy/module_compiler.c	2007-05-31 18:28:27 UTC (rev 2449)
@@ -142,7 +142,12 @@
 						      symtab[symbol_type].table,
 						      key);
 		assert(s != NULL);
-		*dest_value = s->value;
+		
+		if (symbol_type == SYM_LEVELS) {
+			*dest_value = ((level_datum_t *)s)->level->sens;
+		} else {
+			*dest_value = s->value;
+		}
 	} else if (retval == -2) {
 		return -2;
 	} else if (retval < 0) {
@@ -496,7 +501,12 @@
 						      symtab[symbol_type].table,
 						      key);
 		assert(s != NULL);
-		*dest_value = s->value;
+		
+		if (symbol_type == SYM_LEVELS) {
+			*dest_value = ((level_datum_t *)s)->level->sens;
+		} else {
+			*dest_value = s->value;
+		}
 	} else if (retval == -2) {
 		/* ignore require statements if that symbol was
 		 * previously declared and is in current scope */


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