From: Arturo Borrero <arturo.borrero.glez@gmail.com>
Date: Mon, 19 Jan 2015 13:27:46 +0000 (+0100)
Subject: ebtables-compat: prevent options overwrite
X-Git-Tag: v1.6.0~53^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16331e1a3f592a6cb2d5e8eb64ea2e112d997e97;p=thirdparty%2Fiptables.git

ebtables-compat: prevent options overwrite

Parsing options will be overwritten if every time we load a match
the extension options are merged to the original options.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c
index d0f6a3e3..b559a533 100644
--- a/iptables/xtables-eb.c
+++ b/iptables/xtables-eb.c
@@ -618,7 +618,6 @@ static void ebt_load_match(const char *name)
 {
 	struct xtables_match *m;
 	size_t size;
-	opts = ebt_original_options;
 
 	m = xtables_find_match(name, XTF_LOAD_MUST_SUCCEED, NULL);
 	if (m == NULL)
@@ -638,6 +637,7 @@ static void ebt_load_match(const char *name)
 
 static void ebt_load_matches(void)
 {
+	opts = ebt_original_options;
 	ebt_load_match("802_3");
 }