]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
apparmor: depends on NET
authorRandy Dunlap <randy.dunlap@oracle.com>
Mon, 2 Aug 2010 17:52:18 +0000 (10:52 -0700)
committerJames Morris <jmorris@namei.org>
Thu, 5 Aug 2010 11:36:51 +0000 (07:36 -0400)
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>
security/apparmor/Kconfig

index 72555b9ca7d632ef4f48b373445f00f8743ed401..9b9013b2e3211a9c6de17a9001e7939a73bf48e9 100644 (file)
@@ -1,6 +1,6 @@
 config SECURITY_APPARMOR
        bool "AppArmor support"
-       depends on SECURITY
+       depends on SECURITY && NET
        select AUDIT
        select SECURITY_PATH
        select SECURITYFS