From a0b49f1f46a1c31e0d28729fdb3fce9b7b238b3a Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 23 Jul 2008 16:42:42 -0700 Subject: [PATCH] --- yaml --- r: 105579 b: refs/heads/master c: 70eed75d76635ba7350651b9bd96529a306ec67a h: refs/heads/master i: 105577: 99bdecb0432219333cf90324a708b329a1e76b90 105575: 3621e3650fdb853499391ff76179d6eb2994c3e8 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/Kconfig | 2 +- trunk/net/ipv6/netfilter/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7936e67decb1..136b6e5497b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b53fb67e385b856a991d402096379dab462170a +refs/heads/master: 70eed75d76635ba7350651b9bd96529a306ec67a diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig index f23e60c93ef9..90eb7cb47e77 100644 --- a/trunk/net/ipv4/netfilter/Kconfig +++ b/trunk/net/ipv4/netfilter/Kconfig @@ -369,7 +369,7 @@ config IP_NF_SECURITY tristate "Security table" depends on IP_NF_IPTABLES depends on SECURITY - default m if NETFILTER_ADVANCED=n + depends on NETFILTER_ADVANCED help This option adds a `security' table to iptables, for use with Mandatory Access Control (MAC) policy. diff --git a/trunk/net/ipv6/netfilter/Kconfig b/trunk/net/ipv6/netfilter/Kconfig index 689dec899c57..0cfcce7b18d8 100644 --- a/trunk/net/ipv6/netfilter/Kconfig +++ b/trunk/net/ipv6/netfilter/Kconfig @@ -213,7 +213,7 @@ config IP6_NF_SECURITY tristate "Security table" depends on IP6_NF_IPTABLES depends on SECURITY - default m if NETFILTER_ADVANCED=n + depends on NETFILTER_ADVANCED help This option adds a `security' table to iptables, for use with Mandatory Access Control (MAC) policy.