From 37fb6bb3143528ce486ccf8af75e43a94534eea7 Mon Sep 17 00:00:00 2001
From: Kees Cook <kees.cook@canonical.com>
Date: Thu, 4 Feb 2010 14:28:06 -0800
Subject: [PATCH] --- yaml --- r: 184911 b: refs/heads/master c:
 f40a70861ace69001524644473cc389543b06c3c h: refs/heads/master i:   184909:
 195d91fe22f0b88290774db41cf1eeb2858a5399   184907:
 c80f2a7d20343fe5ef31df1392bd7032740d4311   184903:
 dbbddd3b42a486a6483ef1c8ac1acf3e316540bd   184895:
 79714aeed5f42c28ff942c91f09998055ce9baf2 v: v3

---
 [refs]                     | 2 +-
 trunk/security/commoncap.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f0ffa979c34..0191dd26569c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d78ca3cd733d8a2c3dcd88471beb1a15d973eed8
+refs/heads/master: f40a70861ace69001524644473cc389543b06c3c
diff --git a/trunk/security/commoncap.c b/trunk/security/commoncap.c
index cf01b2eebb60..61669730da98 100644
--- a/trunk/security/commoncap.c
+++ b/trunk/security/commoncap.c
@@ -896,7 +896,6 @@ int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
  */
 int cap_syslog(int type, bool from_file)
 {
-	/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */
 	if (type != SYSLOG_ACTION_OPEN && from_file)
 		return 0;
 	if ((type != SYSLOG_ACTION_READ_ALL &&