mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from trunk rev 1490: newer apparmor module uses target instead

Browse source 
of name2, add log parsing support for this.

Nominated-by: John Johansen <john.johansen@canonical.com>
Acked-By: Steve Beattie <sbeattie@ubuntu.com>
This commit is contained in:
Steve Beattie 2010-09-10 00:40:59 -07:00
parent 48587d7179
commit e89ef114bf
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/libapparmor/src/grammar.y
View file

@ -159,6 +159,7 @@ aa_record_event_type lookup_aa_event(unsigned int type)
%token TOK_KEY_CAPABILITY
%token TOK_KEY_CAPNAME
%token TOK_KEY_OFFSET
%token TOK_KEY_TARGET
%token TOK_SYSLOG_KERNEL
@ -453,6 +454,10 @@ key: TOK_KEY_OPERATION TOK_EQUALS TOK_QUOTED_STRING
* loaded policy. We can just drop this currently
*/
}
| TOK_KEY_TARGET TOK_EQUALS safe_string
{ /* target was always name2 in the past */
ret_record->name2 = $3;
}
;
apparmor_event:

2
libraries/libapparmor/src/scanner.l
View file

@ -160,6 +160,7 @@ key_comm "comm"
key_capability "capability"
key_capname "capname"
key_offset "offset"
key_target "target"
audit "audit"
/* syslog tokens */
@ -359,6 +360,7 @@ yy_flex_debug = 0;
*/
{key_capname} { return(TOK_KEY_CAPNAME); }
{key_offset} { return(TOK_KEY_OFFSET); }
{key_target} { return(TOK_KEY_TARGET); }
{syslog_kernel} { BEGIN(dmesg_timestamp); return(TOK_SYSLOG_KERNEL); }
{syslog_month} { yylval->t_str = strdup(yytext); return(TOK_DATE_MONTH); }