Patchwork netfilter: fix missing dependencies for NETFILTER_XT_MATCH_CONNLABEL

login
register
mail settings
Submitter Florian Westphal
Date Feb. 3, 2013, 11:24 a.m.
Message ID <1359890647-25846-1-git-send-email-fw@strlen.de>
Download mbox | patch
Permalink /patch/217742/
State Accepted
Headers show

Comments

Florian Westphal - Feb. 3, 2013, 11:24 a.m.
It was possible to set
NF_CONNTRACK=n
NF_CONNTRACK_LABELS=y

via NETFILTER_XT_MATCH_CONNLABEL=y:

warning: (NETFILTER_XT_MATCH_CONNLABEL) selects NF_CONNTRACK_LABELS which has
unmet direct dependencies (NET && INET && NETFILTER && NF_CONNTRACK)

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
Randy Dunlap - Feb. 3, 2013, 4:04 p.m.
On 02/03/13 03:24, Florian Westphal wrote:
> It was possible to set
> NF_CONNTRACK=n
> NF_CONNTRACK_LABELS=y
> 
> via NETFILTER_XT_MATCH_CONNLABEL=y:
> 
> warning: (NETFILTER_XT_MATCH_CONNLABEL) selects NF_CONNTRACK_LABELS which has
> unmet direct dependencies (NET && INET && NETFILTER && NF_CONNTRACK)
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Florian Westphal <fw@strlen.de>

Acked-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.

> ---
> diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
> index eb2c8eb..d4dd702 100644
> --- a/net/netfilter/Kconfig
> +++ b/net/netfilter/Kconfig
> @@ -860,6 +860,7 @@ config NETFILTER_XT_MATCH_CONNBYTES
>  config NETFILTER_XT_MATCH_CONNLABEL
>  	tristate '"connlabel" match support'
>  	select NF_CONNTRACK_LABELS
> +	depends on NF_CONNTRACK
>  	depends on NETFILTER_ADVANCED
>  	---help---
>  	  This match allows you to test and assign userspace-defined labels names
>
Pablo Neira - Feb. 5, 2013, 3 a.m.
On Sun, Feb 03, 2013 at 08:04:35AM -0800, Randy Dunlap wrote:
> On 02/03/13 03:24, Florian Westphal wrote:
> > It was possible to set
> > NF_CONNTRACK=n
> > NF_CONNTRACK_LABELS=y
> > 
> > via NETFILTER_XT_MATCH_CONNLABEL=y:
> > 
> > warning: (NETFILTER_XT_MATCH_CONNLABEL) selects NF_CONNTRACK_LABELS which has
> > unmet direct dependencies (NET && INET && NETFILTER && NF_CONNTRACK)
> > 
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > Signed-off-by: Florian Westphal <fw@strlen.de>
> 
> Acked-by: Randy Dunlap <rdunlap@infradead.org>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index eb2c8eb..d4dd702 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -860,6 +860,7 @@  config NETFILTER_XT_MATCH_CONNBYTES
 config NETFILTER_XT_MATCH_CONNLABEL
 	tristate '"connlabel" match support'
 	select NF_CONNTRACK_LABELS
+	depends on NF_CONNTRACK
 	depends on NETFILTER_ADVANCED
 	---help---
 	  This match allows you to test and assign userspace-defined labels names