[Selinux-commits] SF.net SVN: selinux: [2730] branches/policyrep/checkpolicy

[<mil...@us...>]

Revision: 2730
          http://selinux.svn.sourceforge.net/selinux/?rev=2730&view=rev
Author:   millertc
Date:     2008-01-09 09:10:44 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
Merge from trunk, rev 2719

Revision Links:
--------------
    http://selinux.svn.sourceforge.net/selinux/?rev=2719&view=rev

Modified Paths:
--------------
    branches/policyrep/checkpolicy/Makefile
    branches/policyrep/checkpolicy/test/dismod.c
    branches/policyrep/checkpolicy/test/dispol.c

Modified: branches/policyrep/checkpolicy/Makefile
===================================================================
--- branches/policyrep/checkpolicy/Makefile	2008-01-09 16:09:26 UTC (rev 2729)
+++ branches/policyrep/checkpolicy/Makefile	2008-01-09 17:10:44 UTC (rev 2730)
@@ -8,6 +8,8 @@
 INCLUDEDIR ?= $(PREFIX)/include
 TARGETS = checkpolicy checkmodule
 
+YACC = bison -y
+
 CFLAGS ?= -g -Wall -Werror -O2 -pipe -fno-strict-aliasing
 
 override CFLAGS += -I. -I${INCLUDEDIR}

Modified: branches/policyrep/checkpolicy/test/dismod.c
===================================================================
--- branches/policyrep/checkpolicy/test/dismod.c	2008-01-09 16:09:26 UTC (rev 2729)
+++ branches/policyrep/checkpolicy/test/dismod.c	2008-01-09 17:10:44 UTC (rev 2730)
@@ -665,13 +665,13 @@
 	return 0;
 }
 
-int display_handle_unknown(policydb_t * policydb, FILE * out_fp)
+int display_handle_unknown(policydb_t * p, FILE * out_fp)
 {
-	if (policydb->handle_unknown == ALLOW_UNKNOWN)
+	if (p->handle_unknown == ALLOW_UNKNOWN)
 		fprintf(out_fp, "Allow unknown classes and perms\n");
-	else if (policydb->handle_unknown == DENY_UNKNOWN)
+	else if (p->handle_unknown == DENY_UNKNOWN)
 		fprintf(out_fp, "Deny unknown classes and perms\n");
-	else if (policydb->handle_unknown == REJECT_UNKNOWN)
+	else if (p->handle_unknown == REJECT_UNKNOWN)
 		fprintf(out_fp, "Reject unknown classes and perms\n");
 	return 0;
 }

Modified: branches/policyrep/checkpolicy/test/dispol.c
===================================================================
--- branches/policyrep/checkpolicy/test/dispol.c	2008-01-09 16:09:26 UTC (rev 2729)
+++ branches/policyrep/checkpolicy/test/dispol.c	2008-01-09 17:10:44 UTC (rev 2730)
@@ -273,13 +273,13 @@
 	return 1;
 }
 
-int display_handle_unknown(policydb_t * policydb, FILE * out_fp)
+int display_handle_unknown(policydb_t * p, FILE * out_fp)
 {
-	if (policydb->handle_unknown == ALLOW_UNKNOWN)
+	if (p->handle_unknown == ALLOW_UNKNOWN)
 		fprintf(out_fp, "Allow unknown classes and permisions\n");
-	else if (policydb->handle_unknown == DENY_UNKNOWN)
+	else if (p->handle_unknown == DENY_UNKNOWN)
 		fprintf(out_fp, "Deny unknown classes and permisions\n");
-	else if (policydb->handle_unknown == REJECT_UNKNOWN)
+	else if (p->handle_unknown == REJECT_UNKNOWN)
 		fprintf(out_fp, "Reject unknown classes and permisions\n");
 	return 0;
 }


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