summaryrefslogtreecommitdiffstats
path: root/iptables
diff options
context:
space:
mode:
authorArturo Borrero <arturo.borrero.glez@gmail.com>2015-01-19 14:27:46 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2015-01-28 17:23:51 +0100
commit16331e1a3f592a6cb2d5e8eb64ea2e112d997e97 (patch)
tree3f31938288c834c68c9c5f4f35d41dba01da0993 /iptables
parent4143a08819a076507abaee0ee18e291b65e5997c (diff)
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>
Diffstat (limited to 'iptables')
-rw-r--r--iptables/xtables-eb.c2
1 files changed, 1 insertions, 1 deletions
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");
}