diff options
Diffstat (limited to 'security/apparmor')
-rw-r--r-- | security/apparmor/audit.c | 1 | ||||
-rw-r--r-- | security/apparmor/include/audit.h | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c index f3fafedd798a..61344b56722e 100644 --- a/security/apparmor/audit.c +++ b/security/apparmor/audit.c | |||
@@ -89,6 +89,7 @@ static char *aa_audit_type[] = { | |||
89 | "STATUS", | 89 | "STATUS", |
90 | "ERROR", | 90 | "ERROR", |
91 | "KILLED" | 91 | "KILLED" |
92 | "AUTO" | ||
92 | }; | 93 | }; |
93 | 94 | ||
94 | /* | 95 | /* |
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h index 1951786d32e9..9317cd81416c 100644 --- a/security/apparmor/include/audit.h +++ b/security/apparmor/include/audit.h | |||
@@ -28,8 +28,6 @@ struct aa_profile; | |||
28 | extern const char *audit_mode_names[]; | 28 | extern const char *audit_mode_names[]; |
29 | #define AUDIT_MAX_INDEX 5 | 29 | #define AUDIT_MAX_INDEX 5 |
30 | 30 | ||
31 | #define AUDIT_APPARMOR_AUTO 0 /* auto choose audit message type */ | ||
32 | |||
33 | enum audit_mode { | 31 | enum audit_mode { |
34 | AUDIT_NORMAL, /* follow normal auditing of accesses */ | 32 | AUDIT_NORMAL, /* follow normal auditing of accesses */ |
35 | AUDIT_QUIET_DENIED, /* quiet all denied access messages */ | 33 | AUDIT_QUIET_DENIED, /* quiet all denied access messages */ |
@@ -45,7 +43,8 @@ enum audit_type { | |||
45 | AUDIT_APPARMOR_HINT, | 43 | AUDIT_APPARMOR_HINT, |
46 | AUDIT_APPARMOR_STATUS, | 44 | AUDIT_APPARMOR_STATUS, |
47 | AUDIT_APPARMOR_ERROR, | 45 | AUDIT_APPARMOR_ERROR, |
48 | AUDIT_APPARMOR_KILL | 46 | AUDIT_APPARMOR_KILL, |
47 | AUDIT_APPARMOR_AUTO | ||
49 | }; | 48 | }; |
50 | 49 | ||
51 | extern const char *op_table[]; | 50 | extern const char *op_table[]; |