mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

parser: Don't merge rules based on audit flags

Browse Source 
This is a step towards restructuring how "audit" is handled so we
can add quiet support and push mapping of audit bits later.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2021-06-09 14:47:52 -07:00
parent fd9a6fe133
commit 6f5dc0e176
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parser/parser_merge.c
View File

@@ -51,6 +51,9 @@ static int file_comp(const void *c1, const void *c2)
if ((*e1)->deny != (*e2)->deny)
return (*e1)->deny < (*e2)->deny ? -1 : 1;
if ((*e1)->audit != (*e2)->audit)
return (*e1)->audit < (*e2)->audit ? -1 : 1;
return strcmp((*e1)->name, (*e2)->name);
}
@@ -95,7 +98,6 @@ static int process_file_entries(Profile *prof)
return -1;
}
cur->perms |= next->perms;
cur->audit |= next->audit;
cur->next = next->next;
next->next = NULL;