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

Fix compilation errors that slipped in. Yes, I realize this breaks the

Browse source 
one translation string that was intended for regexp.y, sorry.
This commit is contained in:
Steve Beattie 2011-02-23 14:40:07 -08:00
parent 3dde3d5322
commit 3768096308
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parser/libapparmor_re/regexp.y
View file

@ -2824,7 +2824,7 @@ uint32_t accept_perms(NodeSet *state, uint32_t *audit_ctl, int *error)
// fprintf(stderr, "change_hat 0x%x\n", perms);
if (*error)
PERROR(_("profile has merged rule with conflicting x modifiers\n"));
fprintf(stderr, "profile has merged rule with conflicting x modifiers\n");
return perms;
}

2
parser/parser_merge.c
View file

@ -109,7 +109,7 @@ static int process_file_entries(struct codomain *cod)
/* check for merged x consistency */
if (!is_merged_x_consistent(cur->mode, next->mode)) {
PERROR(_("profile %s: has merged rule %s with "
"conflicting x modifiers\n",
"conflicting x modifiers\n"),
cod->name, cur->name);
return 0;
}