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

Get rid of all the POS_ and some other unused definitions

Browse Source
This commit is contained in:
Andreas Gruenbacher
2007-03-30 14:59:13 +00:00
parent aeb6205ce8
commit 36e95daeb8
2 changed files with 27 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parser/parser_merge.c
View File

@@ -83,11 +83,11 @@ static int process_file_entries(struct codomain *cod)
for (cur = table[0], next = table[1], n = 1; next != NULL; n++, next = table[n]) {
if (file_comp(&cur, &next) == 0) {
int conflict = CHECK_CONFLICT_UNSAFE(cur->mode, next->mode);
cur->mode |= next->mode;
/* check for merged x consistency */
if (HAS_MAY_EXEC(cur->mode) &&
((KERN_EXEC_MODIFIERS(cur->mode) &
(KERN_EXEC_MODIFIERS(cur->mode) - 1)) ||
(!AA_EXEC_SINGLE_MODIFIER_SET(cur->mode) ||
conflict)) {
PERROR(_("profile %s: has merged rule %s with multiple x modifiers\n"),
cod->name, cur->name);