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 &&