From 12fc4a987b1ddaf667ae0d120842b453d376a03e Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Mon, 20 Jun 2005 16:02:09 +0100
Subject: [PATCH] --- yaml --- r: 8860 b: refs/heads/master c:
 d6e0e1585a1a9a15e48ec47206a809828afe4450 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/audit.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 274a23af891e..b218f1978a38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df5179854bca84ac5be500849b12dd33ce03f03f
+refs/heads/master: d6e0e1585a1a9a15e48ec47206a809828afe4450
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index f0bbfe073136..ab6ac560cfe5 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -437,7 +437,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 		if (!tsk)
 			return -ESRCH;
 
-		if (audit_filter_user(tsk, msg_type)) {
+		if (audit_enabled && audit_filter_user(tsk, msg_type)) {
 			    ab = audit_log_start(NULL, msg_type);
 			    if (ab) {
 				    audit_log_format(ab,