From c76d0f67b3bcb23055f047b46b65a06f01164631 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 12 Oct 2006 14:08:41 -0700 Subject: [PATCH] --- yaml --- r: 39682 b: refs/heads/master c: c08de5d5308ae0d20290344551ddd9cea8ded661 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/Kconfig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a2e4b87be618..0d81239ee6e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9f54596fa20be3edefaa0b24c8714edb945eeaa +refs/heads/master: c08de5d5308ae0d20290344551ddd9cea8ded661 diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index ce94732b8e23..f619c6527266 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/net/netfilter/Kconfig @@ -209,7 +209,9 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_CONNSECMARK tristate '"CONNSECMARK" target support' - depends on NETFILTER_XTABLES && (NF_CONNTRACK_SECMARK || IP_NF_CONNTRACK_SECMARK) + depends on NETFILTER_XTABLES && \ + ((NF_CONNTRACK && NF_CONNTRACK_SECMARK) || \ + (IP_NF_CONNTRACK && IP_NF_CONNTRACK_SECMARK)) help The CONNSECMARK target copies security markings from packets to connections, and restores security markings from connections