From 07f6355181970991c7492d766c71826e6bf0c1e0 Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Wed, 22 Feb 2012 00:20:26 -0800
Subject: [PATCH] --- yaml --- r: 292290 b: refs/heads/master c:
 ade3ddc01e2e426cc24c744be85dcaad4e8f8aba h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/security/apparmor/audit.c         | 1 +
 trunk/security/apparmor/include/audit.h | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 488c90bc4cc3..1acb1a1b3584 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdbd2884df8ad026143bb482a96d38e616947b17
+refs/heads/master: ade3ddc01e2e426cc24c744be85dcaad4e8f8aba
diff --git a/trunk/security/apparmor/audit.c b/trunk/security/apparmor/audit.c
index f3fafedd798a..61344b56722e 100644
--- a/trunk/security/apparmor/audit.c
+++ b/trunk/security/apparmor/audit.c
@@ -89,6 +89,7 @@ static char *aa_audit_type[] = {
 	"STATUS",
 	"ERROR",
 	"KILLED"
+	"AUTO"
 };
 
 /*
diff --git a/trunk/security/apparmor/include/audit.h b/trunk/security/apparmor/include/audit.h
index 1951786d32e9..9317cd81416c 100644
--- a/trunk/security/apparmor/include/audit.h
+++ b/trunk/security/apparmor/include/audit.h
@@ -28,8 +28,6 @@ struct aa_profile;
 extern const char *audit_mode_names[];
 #define AUDIT_MAX_INDEX 5
 
-#define AUDIT_APPARMOR_AUTO 0	/* auto choose audit message type */
-
 enum audit_mode {
 	AUDIT_NORMAL,		/* follow normal auditing of accesses */
 	AUDIT_QUIET_DENIED,	/* quiet all denied access messages */
@@ -45,7 +43,8 @@ enum audit_type {
 	AUDIT_APPARMOR_HINT,
 	AUDIT_APPARMOR_STATUS,
 	AUDIT_APPARMOR_ERROR,
-	AUDIT_APPARMOR_KILL
+	AUDIT_APPARMOR_KILL,
+	AUDIT_APPARMOR_AUTO
 };
 
 extern const char *op_table[];