Commit 1fe7bbb3 authored by Olaf Rempel's avatar Olaf Rempel Committed by Peter Korsgaard
Browse files

iptables: fix disable-ipv6 option

- bumb version to v1.4.5
- add fix for --disable-ipv6 option
  (upstream bug: http://bugzilla.netfilter.org/show_bug.cgi?id=608

)

Signed-off-by: default avatarOlaf Rempel <razzor@kopf-tisch.de>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 8e8354d4
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
--- iptables-1.4.5/xtables.c.org	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/xtables.c	2009-09-20 13:24:11.000000000 +0200
@@ -1484,6 +1484,7 @@
 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 @@
 		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);
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
# iptables
#
#############################################################
IPTABLES_VERSION = 1.4.4
IPTABLES_VERSION = 1.4.5
IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables