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

factor use of id and varid into single token

Browse Source
This commit is contained in:
John Johansen
2007-11-16 09:30:08 +00:00
parent 20d5d20855
commit 999e291acc
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
parser/parser_yacc.y
View File

@@ -216,6 +216,7 @@ struct cod_entry *do_file_rule(char *namespace, char *id, int mode);
%type <var_val> TOK_VALUE %type <var_val> TOK_VALUE
%type <val_list> valuelist %type <val_list> valuelist
%type <boolean> expr %type <boolean> expr
%type <id> id_or_var
%% %%
@@ -594,41 +595,27 @@ expr: TOK_DEFINED TOK_BOOL_VAR
free($2); free($2);
} }
rule: TOK_ID file_mode TOK_END_OF_RULE id_or_var: TOK_ID { $$ = $1; }
id_or_var: TOK_SET_VAR { $$ = $1; };
rule: id_or_var file_mode TOK_END_OF_RULE
{ {
$$ = do_file_rule(NULL, $1, $2); $$ = do_file_rule(NULL, $1, $2);
}; };
rule: TOK_SET_VAR file_mode TOK_END_OF_RULE rule: file_mode id_or_var TOK_END_OF_RULE
{
$$ = do_file_rule(NULL, $1, $2);
};
rule: file_mode TOK_ID TOK_END_OF_RULE
{ {
$$ = do_file_rule(NULL, $2, $1 & ~AA_EXEC_UNSAFE); $$ = do_file_rule(NULL, $2, $1 & ~AA_EXEC_UNSAFE);
}; };
rule: file_mode TOK_SET_VAR TOK_END_OF_RULE rule: TOK_UNSAFE file_mode id_or_var TOK_END_OF_RULE
{
$$ = do_file_rule(NULL, $2, $1 & ~AA_EXEC_UNSAFE);
};
rule: TOK_UNSAFE file_mode TOK_ID TOK_END_OF_RULE
{ {
if (!($2 & AA_MAY_EXEC)) if (!($2 & AA_MAY_EXEC))
yyerror(_("unsafe rule missing exec permissions")); yyerror(_("unsafe rule missing exec permissions"));
$$ = do_file_rule(NULL, $3, $2 | AA_EXEC_UNSAFE); $$ = do_file_rule(NULL, $3, $2 | AA_EXEC_UNSAFE);
}; };
rule: TOK_UNSAFE file_mode TOK_SET_VAR TOK_END_OF_RULE rule: id_or_var file_mode id_or_var
{
if (!($2 & AA_MAY_EXEC))
yyerror(_("unsafe rule missing exec permissions"));
$$ = do_file_rule(NULL, $3, $2 | AA_EXEC_UNSAFE);
};
rule: TOK_ID file_mode TOK_ID
{ {
/* Oopsie, we appear to be missing an EOL marker. If we /* Oopsie, we appear to be missing an EOL marker. If we
* were *smart*, we could work around it. Since we're * were *smart*, we could work around it. Since we're