From: Eric Paris Date: Mon, 15 Nov 2010 23:36:29 +0000 (-0500) Subject: capabilities/syslog: open code cap_syslog logic to fix build failure X-Git-Tag: v2.6.37-rc2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12b3052c3ee8f508b2c7ee4ddd63ed03423409d8;p=pandora-kernel.git capabilities/syslog: open code cap_syslog logic to fix build failure The addition of CONFIG_SECURITY_DMESG_RESTRICT resulted in a build failure when CONFIG_PRINTK=n. This is because the capabilities code which used the new option was built even though the variable in question didn't exist. The patch here fixes this by moving the capabilities checks out of the LSM and into the caller. All (known) LSMs should have been calling the capabilities hook already so it actually makes the code organization better to eliminate the hook altogether. Signed-off-by: Eric Paris Acked-by: James Morris Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed