From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 26 Nov 2019 10:24:16 +0000 (+0100)
Subject: segtree: restore automerge
X-Git-Tag: v0.9.3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a48c1c00b5419fb39af87a22469f77322dc71b31;p=thirdparty%2Fnftables.git

segtree: restore automerge

Always close interval in non-anonymous sets unless the auto-merge
feature is set on.

Fixes: a4ec05381261 ("segtree: always close interval in non-anonymous sets")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/segtree.c b/src/segtree.c
index 9f1eecc0..7217dbca 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -516,7 +516,7 @@ static void segtree_linearize(struct list_head *list, const struct set *set,
 			 */
 			mpz_add_ui(p, prev->right, 1);
 			if (mpz_cmp(p, ei->left) < 0 ||
-			    !(set->flags & NFT_SET_ANONYMOUS)) {
+			    (!(set->flags & NFT_SET_ANONYMOUS) && !merge)) {
 				mpz_sub_ui(q, ei->left, 1);
 				nei = ei_alloc(p, q, NULL, EI_F_INTERVAL_END);
 				list_add_tail(&nei->list, list);