From c4c005f5f0e78a7d34c6c96c9f95561271d1447d Mon Sep 17 00:00:00 2001
From: zhangxiliang <zhangxiliang@cn.fujitsu.com>
Date: Fri, 1 Aug 2008 09:47:01 +0800
Subject: [PATCH] --- yaml --- r: 107259 b: refs/heads/master c:
 036bbf76ad9f83781590623111b80ba0b82930ac h: refs/heads/master i:   107257:
 8c1ea87ddc206c5e32b31704744484960600942e   107255:
 55924bb9947068d54fffc4d826a352aca773e0d3 v: v3

---
 [refs]                     |  2 +-
 trunk/kernel/auditfilter.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7395141f558e..eea756d14328 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d6c9649e236caa2e93e3647256216e57172b011
+refs/heads/master: 036bbf76ad9f83781590623111b80ba0b82930ac
diff --git a/trunk/kernel/auditfilter.c b/trunk/kernel/auditfilter.c
index 98c50cc671bb..b7d354e2b0ef 100644
--- a/trunk/kernel/auditfilter.c
+++ b/trunk/kernel/auditfilter.c
@@ -1022,8 +1022,11 @@ static void audit_update_watch(struct audit_parent *parent,
 			struct audit_buffer *ab;
 			ab = audit_log_start(NULL, GFP_KERNEL,
 				AUDIT_CONFIG_CHANGE);
+			audit_log_format(ab, "auid=%u ses=%u",
+				audit_get_loginuid(current),
+				audit_get_sessionid(current));
 			audit_log_format(ab,
-				"op=updated rules specifying path=");
+				" op=updated rules specifying path=");
 			audit_log_untrustedstring(ab, owatch->path);
 			audit_log_format(ab, " with dev=%u ino=%lu\n",
 				 dev, ino);
@@ -1058,7 +1061,10 @@ static void audit_remove_parent_watches(struct audit_parent *parent)
 				struct audit_buffer *ab;
 				ab = audit_log_start(NULL, GFP_KERNEL,
 					AUDIT_CONFIG_CHANGE);
-				audit_log_format(ab, "op=remove rule path=");
+				audit_log_format(ab, "auid=%u ses=%u",
+					audit_get_loginuid(current),
+					audit_get_sessionid(current));
+				audit_log_format(ab, " op=remove rule path=");
 				audit_log_untrustedstring(ab, w->path);
 				if (r->filterkey) {
 					audit_log_format(ab, " key=");