From: Olaf Rempel <razzor@kopf-tisch.de>
Date: Sun, 20 Sep 2009 11:24:11 +0000 (+0200)
Subject: build: restore --disable-ipv6 functionality on system w/o v6 headers
X-Git-Tag: v1.4.6~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58df90174164fd673e8c4103f7ce0c4e55ef1aec;p=thirdparty%2Fiptables.git

build: restore --disable-ipv6 functionality on system w/o v6 headers

Commit 332e4acc (iptables: accept multiple IP address specifications
for -s, d) broke the --disable-ipv6 configure option.

> ./.libs/libxtables.so: undefined reference to `in6addr_any'

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---

diff --git a/xtables.c b/xtables.c
index 45201248..bda49f84 100644
--- a/xtables.c
+++ b/xtables.c
@@ -1484,6 +1484,7 @@ void
 xtables_ip6parse_multiple(const char *name, struct in6_addr **addrpp,
 		      struct in6_addr **maskpp, unsigned int *naddrs)
 {
+	static const struct in6_addr zero_addr;
 	struct in6_addr *addrp;
 	char buf[256], *p;
 	unsigned int len, i, j, n, count = 1;
@@ -1526,7 +1527,7 @@ xtables_ip6parse_multiple(const char *name, struct in6_addr **addrpp,
 		memcpy(*maskpp + i, addrp, sizeof(*addrp));
 
 		/* if a null mask is given, the name is ignored, like in "any/0" */
-		if (memcmp(*maskpp + i, &in6addr_any, sizeof(in6addr_any)) == 0)
+		if (memcmp(*maskpp + i, &zero_addr, sizeof(zero_addr)) == 0)
 			strcpy(buf, "::");
 
 		addrp = ip6parse_hostnetwork(buf, &n);