mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 18:17:09 +00:00
Code Issues Releases Wiki Activity

Patch from jjohansen@suse.de

Browse Source 
Acked-By: Steve Beattie <sbeattie@suse.de>

Allow using the keyword "hat" in place of the magic symbol '^'
This commit is contained in:
Steve Beattie 2007-07-27 20:48:24 +00:00
parent 9c4e50e7ca
commit 318df7804a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
parser/parser_lex.l
View File

@ -62,6 +62,7 @@ IP {NUMBER}\.{NUMBER}\.{NUMBER}\.{NUMBER}
ALLOWED_QUOTED_ID [^\0"]|\\\" ALLOWED_QUOTED_ID [^\0"]|\\\"
QUOTED_ID \"{ALLOWED_QUOTED_ID}*\" QUOTED_ID \"{ALLOWED_QUOTED_ID}*\"
HAT hat[ \t]+
KEYWORD [[:alpha:]_]+ KEYWORD [[:alpha:]_]+
VARIABLE_NAME [[:alpha:]][[:alnum:]_]* VARIABLE_NAME [[:alpha:]][[:alnum:]_]*
SET_VAR_PREFIX @ SET_VAR_PREFIX @
@ -340,6 +341,11 @@ ADD_ASSIGN \+=
return TOK_MODE; return TOK_MODE;
} }
{HAT} {
BEGIN(SUB_NAME);
return TOK_HAT;
}
{KEYWORD} { {KEYWORD} {
int token = get_keyword_token(yytext); int token = get_keyword_token(yytext);

6
parser/parser_yacc.y
View File

@ -87,6 +87,7 @@ void free_value_list(struct value_list *list);
%token TOK_DEFINED %token TOK_DEFINED
%token TOK_CHANGE_PROFILE %token TOK_CHANGE_PROFILE
%token TOK_NETWORK %token TOK_NETWORK
%token TOK_HAT
/* network tokens */ /* network tokens */
%token TOK_IP %token TOK_IP
@ -593,7 +594,7 @@ rule: TOK_ID file_mode TOK_ID
yyerror(_("missing an end of line character? (entry: %s)"), $1); yyerror(_("missing an end of line character? (entry: %s)"), $1);
}; };
hat: TOK_SEP TOK_ID flags TOK_OPEN rules TOK_CLOSE hat: hat_start TOK_ID flags TOK_OPEN rules TOK_CLOSE
{ {
struct codomain *cod = $5; struct codomain *cod = $5;
PDEBUG("Matched: sep id (%s) open rules close\n", $2); PDEBUG("Matched: sep id (%s) open rules close\n", $2);
@ -688,6 +689,9 @@ action: TOK_TCP_CONN { $$ = AA_TCP_CONNECT; }
| TOK_UDP_RECV { $$ = AA_UDP_RECEIVE; } | TOK_UDP_RECV { $$ = AA_UDP_RECEIVE; }
; ;
hat_start: TOK_SEP {}
| TOK_HAT {}
file_mode: TOK_MODE file_mode: TOK_MODE
{ {
$$ = parse_mode($1); $$ = parse_mode($1);