vserver 2.0-pre4

[linux-2.6.git] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index f067e8a..98114af 100644 (file)
--- 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;
 }