projects / packages / apparmor-parser.git / blame
| Commit | Line | Data |
|---|---|---|
| 1a5177de AM |
1 | === modified file 'parser/rc.apparmor.functions' |
| 2 | --- parser/rc.apparmor.functions 2011-06-01 14:52:35 +0000 | |
| 3 | +++ parser/rc.apparmor.functions 2011-07-14 06:56:45 +0000 | |
| 4 | @@ -198,6 +198,7 @@ | |
| 5 | aa_log_skipped_msg "$profile" | |
| 6 | logger -t "AppArmor(init)" -p daemon.warn "Skipping profile $profile" | |
| 7 | STATUS=2 | |
| 8 | + continue | |
| 9 | elif [ "$skip" -ne 0 ]; then | |
| 10 | continue | |
| 11 | fi | |
| 12 | @@ -206,7 +207,7 @@ | |
| 13 | if force_complain "${profile}" ; then | |
| 14 | COMPLAIN="-C" | |
| 15 | fi | |
| 16 | - $PARSER $ABSTRACTIONS $PARSER_ARGS $COMPLAIN "$profile" > /dev/null | |
| 17 | + $PARSER $ABSTRACTIONS $PARSER_ARGS $PARSER_CUSTOM_ARGS $COMPLAIN "$profile" > /dev/null | |
| 18 | if [ $? -ne 0 ]; then | |
| 19 | aa_log_failure_msg "$profile failed to load" | |
| 20 | STATUS=1 | |
| 21 | ||
| 22 | === modified file 'parser/subdomain.conf' | |
| 23 | --- parser/subdomain.conf 2011-01-13 21:58:26 +0000 | |
| 24 | +++ parser/subdomain.conf 2011-07-14 06:59:27 +0000 | |
| 25 | @@ -23,6 +23,11 @@ | |
| 26 | # Enable the AppArmor event daemon for reporting? | |
| 27 | APPARMOR_ENABLE_AAEVENTD="no" | |
| 28 | ||
| 29 | +## Path: System/AppArmor | |
| 30 | +## Description: Custom user flags for apparmor profile parser | |
| 31 | +# | |
| 32 | +PARSER_CUSTOM_ARGS="" | |
| 33 | + | |
| 34 | #SUBDOMAIN_MODULE_PANIC=XXX | |
| 35 | #This option controls how subdomain behaves when the init script attempts | |
| 36 | #to load the AppArmor module and fails. There are 4 options | |
| 37 |