mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 14:55:10 +00:00
Code Issues Releases Wiki Activity

parser: Add fixes to --config-file option

Browse Source 
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 <apparmor@cboltz.de>
Signed-off-by: John Johansen <john.johansen@canonical.com>
(cherry picked from commit 2c0d7e608c)
This commit is contained in:
John Johansen
2018-08-14 18:36:17 -07:00
parent e97b1e732a
commit a17775b821
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parser/apparmor_parser.pod
View File

@@ -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 failure, instead the parser continues on with processing the remaining
profiles. profiles.
=item --confile-file =item --config-file
Specify the config file to use instead of Specify the config file to use instead of
/etc/apparmor/parser.conf. This option must be the first option /etc/apparmor/parser.conf. This option must be the first option

2
parser/parser_main.c
View File

@@ -159,7 +159,7 @@ struct option long_options[] = {
{"jobs", 1, 0, 'j'}, {"jobs", 1, 0, 'j'},
{"max-jobs", 1, 0, 136}, /* no short option */ {"max-jobs", 1, 0, 136}, /* no short option */
{"print-cache-dir", 0, 0, 137}, /* 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 */ {"print-config-file", 0, 0, 140}, /* no short option */
{NULL, 0, 0, 0}, {NULL, 0, 0, 0},
}; };