From owner-p4-projects  Thu May 16  9:38:27 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A8F5D37B40D; Thu, 16 May 2002 09:38:18 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9C06637B40A
	for <perforce@freebsd.org>; Thu, 16 May 2002 09:38:17 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4GGcHH00411
	for perforce@freebsd.org; Thu, 16 May 2002 09:38:17 -0700 (PDT)
	(envelope-from cvance@tislabs.com)
Date: Thu, 16 May 2002 09:38:17 -0700 (PDT)
Message-Id: <200205161638.g4GGcHH00411@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
Subject: PERFORCE change 11396 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11396

Change 11396 by cvance@cvance_korben on 2002/05/16 09:37:35

	Sync back up with SELinux:
		- allow empty policy statements (also allows m4 macros to be
		  terminated with a ';')
		- allow nested lists in {}

Affected files ...

... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_parse.y#2 edit
... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_scan.l#2 edit

Differences ...

==== //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_parse.y#2 (text+ko) ====

@@ -211,6 +211,7 @@
 			;
 te_rbac_decl		: te_decl
 			| rbac_decl
+			| ';'
                         ;
 rbac_decl		: role_type_def
                         | role_dominance
@@ -461,7 +462,7 @@
 			;
 names           	: identifier
 			{ if (insert_separator(0)) return -1; }
-			| '{' identifier_list '}'
+			| nested_id_set
 			{ if (insert_separator(0)) return -1; }
 			| asterisk
                         { if (insert_id("*", 0)) return -1; 
@@ -469,7 +470,7 @@
 			| tilde identifier
                         { if (insert_id("~", 0)) return -1;
 			  if (insert_separator(0)) return -1; }
-			| tilde '{' identifier_list '}'
+			| tilde nested_id_set
 	 		{ if (insert_id("~", 0)) return -1; 
 			  if (insert_separator(0)) return -1; }
 			;
@@ -494,6 +495,12 @@
 identifier_list		: identifier
 			| identifier_list identifier
 			;
+nested_id_set           : '{' nested_id_list '}'
+                        ;
+nested_id_list          : nested_id_element | nested_id_list nested_id_element
+                        ;
+nested_id_element       : identifier | nested_id_set
+                        ;
 identifier		: IDENTIFIER
 			{ if (insert_id(yytext,0)) return -1; }
 			;

==== //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_scan.l#2 (text+ko) ====

@@ -102,7 +102,7 @@
 T1				{ return(T1); }
 t2 |
 T2				{ return(T2); }
-"/"({letter}|{digit}|_|"/")*	{ return(PATH); }
+"/"({letter}|{digit}|_|"."|"/")*	{ return(PATH); }
 {letter}({letter}|{digit}|_)*	{ return(IDENTIFIER); }
 {digit}{digit}*                 { return(NUMBER); }
 #[^\n]*                         { /* delete comments */ }

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message