Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1878869 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: fix several Kconfig problems in NF_LOG_* 



warning: (NETFILTER_XT_TARGET_LOG) selects NF_LOG_IPV6 which has unmet direct dependencies (NET && INET && IPV6 && NETFILTER && IP6_NF_IPTABLES && NETFILTER_ADVANCED)
warning: (NF_LOG_IPV4 && NF_LOG_IPV6) selects NF_LOG_COMMON which has unmet direct dependencies (NET && INET && NETFILTER && NF_CONNTRACK)

Fixes: 83e96d44 ("netfilter: log: split family specific code to nf_log_{ip,ip6,common}.c files")
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 09d27b88

net/ipv4/netfilter/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -36,6 +36,16 @@ config NF_CONNTRACK_PROC_COMPAT 


	  If unsure, say Y.



config NF_LOG_ARP

	tristate "ARP packet logging"

	default m if NETFILTER_ADVANCED=n

	select NF_LOG_COMMON



config NF_LOG_IPV4

	tristate "IPv4 packet logging"

	default m if NETFILTER_ADVANCED=n

	select NF_LOG_COMMON



config NF_TABLES_IPV4

	depends on NF_TABLES

	tristate "IPv4 nf_tables support"
@@ -159,16 +169,6 @@ config IP_NF_TARGET_SYNPROXY 


	  To compile it as a module, choose M here. If unsure, say N.



config NF_LOG_ARP

	tristate "ARP packet logging"

	default m if NETFILTER_ADVANCED=n

	select NF_LOG_INET



config NF_LOG_IPV4

	tristate "IPv4 packet logging"

	default m if NETFILTER_ADVANCED=n

	select NF_LOG_COMMON



# NAT + specific targets: nf_conntrack

config NF_NAT_IPV4

	tristate "IPv4 NAT"

net/ipv6/netfilter/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ config NFT_REJECT_IPV6 
	default NFT_REJECT

	tristate



config NF_LOG_IPV6

	tristate "IPv6 packet logging"

	depends on NETFILTER_ADVANCED

	select NF_LOG_COMMON



config IP6_NF_IPTABLES

	tristate "IP6 tables support (required for filtering)"

	depends on INET && IPV6
@@ -227,11 +232,6 @@ config IP6_NF_SECURITY 


         If unsure, say N.



config NF_LOG_IPV6

	tristate "IPv6 packet logging"

	depends on NETFILTER_ADVANCED

	select NF_LOG_COMMON



config NF_NAT_IPV6

	tristate "IPv6 NAT"

	depends on NF_CONNTRACK_IPV6

net/netfilter/Kconfig

+4 −6
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ config NF_CONNTRACK 


	  To compile it as a module, choose M here.  If unsure, say N.



config NF_LOG_COMMON

	tristate



if NF_CONNTRACK



config NF_CONNTRACK_MARK
@@ -359,9 +362,6 @@ config NETFILTER_NETLINK_QUEUE_CT 
	  If this option is enabled, NFQUEUE can include Connection Tracking

	  information together with the packet is the enqueued via NFNETLINK.



config NF_LOG_COMMON

	tristate



config NF_NAT

	tristate
@@ -747,9 +747,7 @@ config NETFILTER_XT_TARGET_LED 


config NETFILTER_XT_TARGET_LOG

	tristate "LOG target support"

	select NF_LOG

	select NF_LOG_IPV4

	select NF_LOG_IPV6

	depends on NF_LOG_IPV4 && NF_LOG_IPV6

	default m if NETFILTER_ADVANCED=n

	help

	  This option adds a `LOG' target, which allows you to create rules in