From a17775b821e92fa3e09e60954f9bc3fd9791ef4b Mon Sep 17 00:00:00 2001 From: John Johansen Date: Tue, 14 Aug 2018 18:36:17 -0700 Subject: [PATCH] parser: Add fixes to --config-file option After the config file patch was committed to 2.13 a couple of improvements were suggested by intrigeri and cboltz. These have been done as a separate patch so they can be applied to both dev and 2.13. PR: https://gitlab.com/apparmor/apparmor/merge_requests/170 Acked-by: Christian Boltz Signed-off-by: John Johansen (cherry picked from commit 2c0d7e608cf008abf8f7ed093d8289edd8797b4d) --- parser/apparmor_parser.pod | 2 +- parser/parser_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/apparmor_parser.pod b/parser/apparmor_parser.pod index af2a750d4..34e05527b 100644 --- a/parser/apparmor_parser.pod +++ b/parser/apparmor_parser.pod @@ -355,7 +355,7 @@ This option tells the parser to not attempt to rebuild the cache on failure, instead the parser continues on with processing the remaining profiles. -=item --confile-file +=item --config-file Specify the config file to use instead of /etc/apparmor/parser.conf. This option must be the first option diff --git a/parser/parser_main.c b/parser/parser_main.c index 37d27daa9..8af5a1813 100644 --- a/parser/parser_main.c +++ b/parser/parser_main.c @@ -159,7 +159,7 @@ struct option long_options[] = { {"jobs", 1, 0, 'j'}, {"max-jobs", 1, 0, 136}, /* no short option */ {"print-cache-dir", 0, 0, 137}, /* no short option */ - {"config-file", 1, 0, 139}, /* early option */ + {"config-file", 1, 0, 139}, /* early option, no short option */ {"print-config-file", 0, 0, 140}, /* no short option */ {NULL, 0, 0, 0}, };