X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=security%2Fcommoncap.c;h=98114af88bcc72ca030afa7b1822668c561c7b62;hb=4b659086703c3cfdabfc916b517590ad55d1ddfa;hp=f067e8acbe332fdacf889ecf3cf5f0107592381b;hpb=6a77f38946aaee1cd85eeec6cf4229b204c15071;p=linux-2.6.git

diff --git a/security/commoncap.c b/security/commoncap.c
index f067e8acb..98114af88 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -311,7 +311,8 @@ void cap_task_reparent_to_init (struct task_struct *p)
 
 int cap_syslog (int type)
 {
-	if ((type != 3 && type != 10) && !capable(CAP_SYS_ADMIN))
+	if ((type != 3 && type != 10) &&
+		!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_SYSLOG))
 		return -EPERM;
 	return 0;
 }