From 76925a236c2964ad4d09edddda4cd6c19cb96145 Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Thu, 3 Jan 2013 16:12:20 -0800 Subject: [PATCH] Merge from trunk commit 2065: Original message: apparmor: correct apparmor_parser -N command privilege Fix the apparmor_parsers -N command (which dumps the list of profile names found in a policy file) to be available without privilege and also make it be recognized as a command instead of an option so that it can conflict with -a -r -R -S and -o. Currently it can be specified with these commands but will cause the parser to short circuit just dumping the names and not doing the actual profile compile or load. Signed-off-by: John Johansen Acked-By: Steve Beattie Nominated-by: Steve Beattie Acked-by: John Johansen --- parser/parser_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parser/parser_main.c b/parser/parser_main.c index 474dc0a25..d719fe0d8 100644 --- a/parser/parser_main.c +++ b/parser/parser_main.c @@ -456,8 +456,10 @@ static int process_arg(int c, char *optarg) skip_cache = 1; break; case 'N': + count++; names_only = 1; skip_cache = 1; + kernel_load = 0; break; case 'S': count++;