summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-08-02 10:52:18 -0700
committerJames Morris <jmorris@namei.org>2010-08-05 07:36:51 -0400
commit06c22dadc6d3f9b65e55407a87faaf6a4a014112 (patch)
treee310b20a17014b491d86818fd58878839a48dffc
parent3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (diff)
downloadlinux-06c22dadc6d3f9b65e55407a87faaf6a4a014112.tar.bz2
apparmor: depends on NET
SECURITY_APPARMOR should depend on NET since AUDIT needs (depends on) NET. Fixes 70-80 errors that occur when CONFIG_NET is not enabled, but APPARMOR selects AUDIT without qualification. E.g.: audit.c:(.text+0x33361): undefined reference to `netlink_unicast' (.text+0x333df): undefined reference to `netlink_unicast' audit.c:(.text+0x3341d): undefined reference to `skb_queue_tail' audit.c:(.text+0x33424): undefined reference to `kfree_skb' audit.c:(.text+0x334cb): undefined reference to `kfree_skb' audit.c:(.text+0x33597): undefined reference to `skb_put' audit.c:(.text+0x3369b): undefined reference to `__alloc_skb' audit.c:(.text+0x336d7): undefined reference to `kfree_skb' (.text+0x3374c): undefined reference to `__alloc_skb' auditfilter.c:(.text+0x35305): undefined reference to `skb_queue_tail' lsm_audit.c:(.text+0x2873): undefined reference to `init_net' lsm_audit.c:(.text+0x2878): undefined reference to `dev_get_by_index' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--security/apparmor/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
index 72555b9ca7d6..9b9013b2e321 100644
--- a/security/apparmor/Kconfig
+++ b/security/apparmor/Kconfig
@@ -1,6 +1,6 @@
config SECURITY_APPARMOR
bool "AppArmor support"
- depends on SECURITY
+ depends on SECURITY && NET
select AUDIT
select SECURITY_PATH
select SECURITYFS