50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
|
From: John Johansen <jjohansen@suse.de>
|
||
|
|
Subject: AppArmor audit types
|
||
|
|
Upsteam: yes
|
||
|
|
|
||
|
|
Update auditd for the extended types supported by AppArmor.
|
||
|
|
|
||
|
|
Signed-off-by: John Johansen <jjohansen@suse.de>
|
||
|
|
|
||
|
|
---
|
||
|
|
lib/libaudit.h | 10 ++++++++--
|
||
|
|
lib/msg_typetab.h | 8 +++++++-
|
||
|
|
2 files changed, 15 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/lib/libaudit.h
|
||
|
|
+++ b/lib/libaudit.h
|
||
|
|
@@ -131,8 +131,14 @@ extern "C" {
|
||
|
|
#endif
|
||
|
|
#define AUDIT_FIRST_APPARMOR 1500
|
||
|
|
#define AUDIT_LAST_APPARMOR 1599
|
||
|
|
-#ifndef AUDIT_SD
|
||
|
|
-#define AUDIT_SD 1500 /* Not upstream yet */
|
||
|
|
+#ifndef AUDIT_AA
|
||
|
|
+#define AUDIT_AA 1500 /* Not upstream yet */
|
||
|
|
+#define AUDIT_APPARMOR_AUDIT 1501
|
||
|
|
+#define AUDIT_APPARMOR_ALLOWED 1502
|
||
|
|
+#define AUDIT_APPARMOR_DENIED 1503
|
||
|
|
+#define AUDIT_APPARMOR_HINT 1504
|
||
|
|
+#define AUDIT_APPARMOR_STATUS 1505
|
||
|
|
+#define AUDIT_APPARMOR_ERROR 1506
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#define AUDIT_FIRST_KERN_CRYPTO_MSG 1600
|
||
|
|
--- a/lib/msg_typetab.h
|
||
|
|
+++ b/lib/msg_typetab.h
|
||
|
|
@@ -105,7 +105,13 @@ _S(AUDIT_MAC_IPSEC_DELSPD, "MA
|
||
|
|
_S(AUDIT_ANOM_PROMISCUOUS, "ANOM_PROMISCUOUS" )
|
||
|
|
_S(AUDIT_ANOM_ABEND, "ANOM_ABEND" )
|
||
|
|
#ifdef WITH_APPARMOR
|
||
|
|
-_S(AUDIT_SD, "APPARMOR" )
|
||
|
|
+_S(AUDIT_AA, "APPARMOR" )
|
||
|
|
+_S(AUDIT_APPARMOR_AUDIT, "APPARMOR_AUDIT" )
|
||
|
|
+_S(AUDIT_APPARMOR_ALLOWED, "APPARMOR_ALLOWED" )
|
||
|
|
+_S(AUDIT_APPARMOR_DENIED, "APPARMOR_DENIED" )
|
||
|
|
+_S(AUDIT_APPARMOR_HINT, "APPARMOR_HINT" )
|
||
|
|
+_S(AUDIT_APPARMOR_STATUS, "APPARMOR_STATUS" )
|
||
|
|
+_S(AUDIT_APPARMOR_ERROR, "APPARMOR_ERROR" )
|
||
|
|
#endif
|
||
|
|
_S(AUDIT_KERNEL, "KERNEL" )
|
||
|
|
_S(AUDIT_ANOM_LOGIN_FAILURES, "ANOM_LOGIN_FAILURES" )
|