]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
ebtables-compat: prevent options overwrite
authorArturo Borrero <arturo.borrero.glez@gmail.com>
Mon, 19 Jan 2015 13:27:46 +0000 (14:27 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 28 Jan 2015 16:23:51 +0000 (17:23 +0100)
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>
iptables/xtables-eb.c

index d0f6a3e37bd88120e061800ecdf92ee805347f82..b559a533dc0001064d5ce72cd4d74c4853820b01 100644 (file)
@@ -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");
 }