From 6df91dbe3724aa476d4467d268c679f8e5946837 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 23 May 2006 01:36:13 -0400
Subject: [PATCH] --- yaml --- r: 28031 b: refs/heads/master c:
 014149cce19c5acb19014e57a5b739b7f64e6fbf h: refs/heads/master i:   28029:
 0e09c7cdf072745bc097f54e30a0e49a8d8f60f9   28027:
 80a706dd53ab3a215c86b06a790ce245f1755e8d   28023:
 f147f7ba876fbaf300d312439c8cae0d6f44f1e8   28015:
 dd60387f4925129b48c45ab75fd9ccb447677e8b   27999:
 cc0953cf560afe05bb2f559ef3b2ba31b5ac5669   27967:
 b2a7ad93201cd08280efb7e1659f4285fdc40de7   27903:
 b7697a3d0268bf0863d910d45478064061c8954c v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/auditfilter.c | 8 +++++---
 trunk/kernel/auditsc.c     | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 83af15a18223..c734db753c7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8945bb51a2bb6623cfa36b9ff63594f46d513aa
+refs/heads/master: 014149cce19c5acb19014e57a5b739b7f64e6fbf
diff --git a/trunk/kernel/auditfilter.c b/trunk/kernel/auditfilter.c
index b3fccd6808f9..df9503da40fb 100644
--- a/trunk/kernel/auditfilter.c
+++ b/trunk/kernel/auditfilter.c
@@ -128,8 +128,11 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
 #endif
 		;
 	}
-	if (rule->action != AUDIT_NEVER && rule->action != AUDIT_POSSIBLE &&
-	    rule->action != AUDIT_ALWAYS)
+	if (unlikely(rule->action == AUDIT_POSSIBLE)) {
+		printk(KERN_ERR "AUDIT_POSSIBLE is deprecated\n");
+		goto exit_err;
+	}
+	if (rule->action != AUDIT_NEVER && rule->action != AUDIT_ALWAYS)
 		goto exit_err;
 	if (rule->field_count > AUDIT_MAX_FIELDS)
 		goto exit_err;
@@ -734,7 +737,6 @@ static int audit_filter_user_rules(struct netlink_skb_parms *cb,
 	}
 	switch (rule->action) {
 	case AUDIT_NEVER:    *state = AUDIT_DISABLED;	    break;
-	case AUDIT_POSSIBLE: *state = AUDIT_BUILD_CONTEXT;  break;
 	case AUDIT_ALWAYS:   *state = AUDIT_RECORD_CONTEXT; break;
 	}
 	return 1;
diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c
index 05d31ee4f3dd..4503c4663cf8 100644
--- a/trunk/kernel/auditsc.c
+++ b/trunk/kernel/auditsc.c
@@ -307,7 +307,6 @@ static int audit_filter_rules(struct task_struct *tsk,
 	}
 	switch (rule->action) {
 	case AUDIT_NEVER:    *state = AUDIT_DISABLED;	    break;
-	case AUDIT_POSSIBLE: *state = AUDIT_BUILD_CONTEXT;  break;
 	case AUDIT_ALWAYS:   *state = AUDIT_RECORD_CONTEXT; break;
 	}
 	return 1;