---

yaml --- r: 262698 b: refs/heads/master c: f2c0d02 h: refs/heads/master v: v3
git-mirror · Aug 10, 2011 · 8736bdf · 8736bdf
1 parent 4d96669
commit 8736bdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f50fad65b87a8776ae989ca059ad6c17925dfc3
+refs/heads/master: f2c0d0266cc5eb36a4aa44944b4096ec121490aa
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
@@ -318,8 +318,10 @@ static int check_syslog_permissions(int type, bool from_file)
 			return 0;
 		/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
 		if (capable(CAP_SYS_ADMIN)) {
-			WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
-				 "but no CAP_SYSLOG (deprecated).\n");
+			printk_once(KERN_WARNING "%s (%d): "
+				 "Attempt to access syslog with CAP_SYS_ADMIN "
+				 "but no CAP_SYSLOG (deprecated).\n",
+				 current->comm, task_pid_nr(current));
 			return 0;
 		}
 		return -EPERM;