ipset 2.2.9 released

diff --git a/ChangeLog b/ChangeLog
index 5cce591a5ae0f933ecb96e51a0465c2878c78b5c..8331a6d0124781a6be9285dd920ffc39c5c1003d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2.2.9
+ - 'ipset -N' did not generate proper return code
+ - 'limit' module parameter added to the kernel modules of the
+   iphash, ipporthash, nethash and iptree type of sets so that
+   the maximal number of elements can now be limited
+ - zero valued entries (port 0 or IP address 0.0.0.0) were
+   detected as members of the hash/tree kind of sets
+   (reported by Andrew Kraslavsky)
+ - list and save operations used the external identifier
+   of the sets for the bindings instead of the internal one
+   (reported by Amin Azez)
+
 2.2.8
  - Nasty off-by-one bug fixed in iptree type of sets
    (bug reported by Pablo Sole)

diff --git a/Makefile b/Makefile
index 087a9dd0554529ee533c03a5e1909928f03c76d7..808992c728e89bf72a46164f07e31f54074d81f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifndef KERNEL_DIR
 KERNEL_DIR=/usr/src/linux
 endif
 
-IPSET_VERSION:=2.2.8
+IPSET_VERSION:=2.2.9
 
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib

diff --git a/ipset.c b/ipset.c
index adf37b1397138f4f7443c76e9ae4ab828270682c..aab4baaa966c052cae46e2b35eb6c43a188de6a3 100644 (file)
--- a/ipset.c
+++ b/ipset.c
@@ -386,7 +386,7 @@ static void check_protocolversion(void)
                           req_version.version, IP_SET_PROTOCOL_VERSION);
 }
 
-static void set_command(int *cmd, const int newcmd)
+static void set_command(unsigned *cmd, const int newcmd)
 {
        if (*cmd != CMD_NONE)
                exit_error(PARAMETER_PROBLEM, "Can't use -%c with -%c\n",
@@ -2099,7 +2099,8 @@ int parse_commandline(int argc, char *argv[])
                                        exit_error(PARAMETER_PROBLEM,
                                                   "Unknown arg `%s'",
                                                   argv[optind - 1]);
-
+                               
+                               res = 0;
                        }
 
                        DP("next arg");