Date: Thu, 16 May 2002 09:38:17 -0700 (PDT) From: Chris Vance <cvance@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11396 for review Message-ID: <200205161638.g4GGcHH00411@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205161638.g4GGcHH00411>