ipset: fast forward to 2.5.0

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 656de9ac1c89939111e0f975cd3ccc5fcb9ac30c..54fdf32232414c372c1d27f489c4ae19261eddee 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,7 @@
 
 
 - ipset: fix for compilation with 2.6.29-rt
+- ipset: fast forward to 2.5.0
 - rename xt_portscan to xt_lscan ("low-level scan") because
   "portscan" as a wor caused confusion
 - xt_LOGMARK: print incoming interface index

diff --git a/extensions/ipset/ipset.8 b/extensions/ipset/ipset.8
index 0d578699edcd04c18ec23133afc9039c0df37513..522608e9f49dca39b58e12bd6037c43cb1361339 100644 (file)
--- a/extensions/ipset/ipset.8
+++ b/extensions/ipset/ipset.8
@@ -602,8 +602,4 @@ Joakim Axelsson, Patrick Schaaf and Martin Josefsson.
 .P
 Sven Wegener wrote the iptreemap type.
 .SH LAST REMARK
-.BR "I stand on the shoulder of giants."
-.\" .. and did I mention that we are incredibly cool people?
-.\" .. sexy, too ..
-.\" .. witty, charming, powerful ..
-.\" .. and most of all, modest ..
+.BR "I stand on the shoulders of giants."

diff --git a/extensions/ipset/ipset.c b/extensions/ipset/ipset.c
index 8ce0566345981eb62f7a99edf7395247a056d905..013906f6f4c47157ced7925a2f0430468009fb4b 100644 (file)
--- a/extensions/ipset/ipset.c
+++ b/extensions/ipset/ipset.c
@@ -30,7 +30,7 @@
 #define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe"
 #endif
 
-#define IPSET_VERSION "2.4.9"
+#define IPSET_VERSION "2.5.0"
 
 char program_name[] = "ipset";
 char program_version[] = IPSET_VERSION;
@@ -629,7 +629,8 @@ void parse_ip(const char *str, ip_set_ip_t * ip)
                                   "host/network `%s' resolves to serveral ip-addresses. "
                                   "Please specify one.", str);
 
-               *ip = ntohl(((struct in_addr *) host->h_addr_list[0])->s_addr);
+               memcpy(&addr, host->h_addr_list[0], sizeof(struct in_addr));
+               *ip = ntohl(addr.s_addr);
                return;
        }