From: Serge E. Hallyn <serge@hallyn.com>
Date: Wed, 8 Dec 2010 15:19:01 +0000 (+0000)
Subject: syslog: check cap_syslog when dmesg_restrict
X-Git-Tag: v2.6.38-rc1~429^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38ef4c2e437d11b5922723504b62824e96761459;p=pandora-kernel.git

syslog: check cap_syslog when dmesg_restrict

Eric Paris pointed out that it doesn't make sense to require
both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions.
So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict
is set.

(I'm also consolidating the now common error path)

Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Acked-by: Eric Paris <eparis@redhat.com>
Acked-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
---

Reading git-diff-tree failed