From 3768096308e363d31adc6886dcbe7f60afd92d20 Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Wed, 23 Feb 2011 14:40:07 -0800 Subject: [PATCH] Fix compilation errors that slipped in. Yes, I realize this breaks the one translation string that was intended for regexp.y, sorry. --- parser/libapparmor_re/regexp.y | 2 +- parser/parser_merge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/libapparmor_re/regexp.y b/parser/libapparmor_re/regexp.y index ba51f1f81..aac11572f 100644 --- a/parser/libapparmor_re/regexp.y +++ b/parser/libapparmor_re/regexp.y @@ -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; } diff --git a/parser/parser_merge.c b/parser/parser_merge.c index b47f96258..cc95a7b03 100644 --- a/parser/parser_merge.c +++ b/parser/parser_merge.c @@ -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; }