New release again, to fix a mistyping of me and get rid of bool.

diff --git a/Makefile b/Makefile
index d663f92a2417881703c901b565bd6d9cc8a902cf..1894679af919478313a6f32514fd2e5e60cd32d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ ifndef V
 V=0
 endif
 
-IPSET_VERSION:=3.1
+IPSET_VERSION:=3.2
 
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib

diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index fd440ef717307875d0dc9674dcae28795e8a0090..f0c3616fd7918ad7e0407eba6bd2bde811bfea1f 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+3.2
+  - Mixed up formats in ip_set_iptree.c (Rob Sterenborg)
+  - Don't use 'bool' for backward compatibility reasons (Rob Sterenborg)
+
 3.1
   - Nonexistent sets were reported as existing sets when testing
     from userspace in setlist type of sets (bug reported by Victor A.

diff --git a/kernel/ip_set_iptree.c b/kernel/ip_set_iptree.c
index f7d64b703f5b1e267746d9d6c9b6610b3ff73f9b..1ef826341071b332b39f68d3a083456c0a9676e7 100644 (file)
--- a/kernel/ip_set_iptree.c
+++ b/kernel/ip_set_iptree.c
@@ -282,7 +282,7 @@ iptree_create(struct ip_set *set, const void *data, u_int32_t size)
        struct ip_set_iptree *map;
 
        if (size != sizeof(struct ip_set_req_iptree_create)) {
-               ip_set_printk("data length wrong (want %lu, have %zu)",
+               ip_set_printk("data length wrong (want %zu, have %lu)",
                              sizeof(struct ip_set_req_iptree_create),
                              (unsigned long)size);
                return -EINVAL;

diff --git a/kernel/ip_set_setlist.c b/kernel/ip_set_setlist.c
index 612f81f736f384b67b611054751b0c8929ef650d..2b1c6b65f56751b2ef77b46530eef1a4dbe34152 100644 (file)
--- a/kernel/ip_set_setlist.c
+++ b/kernel/ip_set_setlist.c
@@ -16,17 +16,12 @@
 #include <linux/netfilter_ipv4/ip_set_bitmaps.h>
 #include <linux/netfilter_ipv4/ip_set_setlist.h>
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
-typedef _Bool bool;
-enum { false = 0, true = 1, };
-#endif
-
 /*
  * before ==> index, ref
  * after  ==> ref, index
  */
 
-static inline bool
+static inline int
 next_index_eq(const struct ip_set_setlist *map, int i, ip_set_id_t index)
 {
        return i < map->size && map->index[i] == index;
@@ -175,7 +170,7 @@ setlist_kadd(struct ip_set *set,
        return res;
 }
 
-static inline bool
+static inline int
 unshift_setlist(struct ip_set_setlist *map, int i)
 {
        int j;