anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-07 05:05:12 +02:00
Code Issues Releases Wiki Activity

build: do not attempt to build IPv6 parts if CONFIG_IP6_NF_IPTABLES=n

Browse Source 
Checking for IPV6 is not sufficient, use IP6_NF_IPTABLES instead.
This commit is contained in:
Jan Engelhardt
2012-07-14 23:19:16 +02:00
parent 0c1375414d
commit 5c615a3c73
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/changelog.txt
View File

@@ -3,7 +3,7 @@ HEAD
==== ====
Fixes: Fixes:
- SYSRQ: fix double target initialization at module load - SYSRQ: fix double target initialization at module load
- build: do not attempt to build IPv6 parts if CONFIG_IPV6=n - build: do not attempt to build IPv6 parts if CONFIG_IP6_NF_IPTABLES=n
Enhancements: Enhancements:
- TARPIT gained IPv6 support - TARPIT gained IPv6 support

2
extensions/Kbuild
View File

@@ -17,7 +17,7 @@ endif
obj-${build_IPMARK} += xt_IPMARK.o obj-${build_IPMARK} += xt_IPMARK.o
obj-${build_LOGMARK} += xt_LOGMARK.o obj-${build_LOGMARK} += xt_LOGMARK.o
obj-${build_RAWNAT} += xt_RAWNAT.o iptable_rawpost.o obj-${build_RAWNAT} += xt_RAWNAT.o iptable_rawpost.o
ifneq (${CONFIG_IPV6},) ifneq (${CONFIG_IP6_NF_IPTABLES},)
obj-${build_RAWNAT} += ip6table_rawpost.o obj-${build_RAWNAT} += ip6table_rawpost.o
endif endif
obj-${build_SYSRQ} += xt_SYSRQ.o obj-${build_SYSRQ} += xt_SYSRQ.o

2
extensions/compat_xtables.c
View File

@@ -26,7 +26,7 @@
#endif #endif
#include "compat_skbuff.h" #include "compat_skbuff.h"
#include "compat_xtnu.h" #include "compat_xtnu.h"
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
# define WITH_IPV6 1 # define WITH_IPV6 1
#endif #endif

3
extensions/xt_RAWNAT.c
View File

@@ -22,8 +22,7 @@
#include <net/ipv6.h> #include <net/ipv6.h>
#include "compat_xtables.h" #include "compat_xtables.h"
#include "xt_RAWNAT.h" #include "xt_RAWNAT.h"
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
# define WITH_IPV6 1 # define WITH_IPV6 1
#endif #endif

2
extensions/xt_SYSRQ.c
View File

@@ -30,7 +30,7 @@
(defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)) (defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE))
# define WITH_CRYPTO 1 # define WITH_CRYPTO 1
#endif #endif
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
# define WITH_IPV6 1 # define WITH_IPV6 1
#endif #endif

2
extensions/xt_TARPIT.c
View File

@@ -55,7 +55,7 @@
#include <net/tcp.h> #include <net/tcp.h>
#include "compat_xtables.h" #include "compat_xtables.h"
#include "xt_TARPIT.h" #include "xt_TARPIT.h"
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
# define WITH_IPV6 1 # define WITH_IPV6 1
#endif #endif

2
extensions/xt_TEE.c
View File

@@ -33,7 +33,7 @@
# define WITH_CONNTRACK 1 # define WITH_CONNTRACK 1
# include <net/netfilter/nf_conntrack.h> # include <net/netfilter/nf_conntrack.h>
#endif #endif
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
# define WITH_IPV6 1 # define WITH_IPV6 1
#endif #endif