diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-05-25 05:34:04 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-05-25 05:34:04 +0200 |
| commit | 790845385fb84ce8e79a96e91fc6c4f7df60713d (patch) | |
| tree | 3a0269859e66b8703af172f8e0debe846db124a6 /extensions/libip6t_ah.c | |
| parent | 17f7937f79af4d260c60cb800e56fc0df0a48b37 (diff) | |
| parent | db50b83bc3cd634beb71f38978ad7d035c88ff11 (diff) | |
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'extensions/libip6t_ah.c')
| -rw-r--r-- | extensions/libip6t_ah.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c index d30ddfa4..26f81408 100644 --- a/extensions/libip6t_ah.c +++ b/extensions/libip6t_ah.c @@ -28,13 +28,6 @@ static const struct xt_option_entry ah_opts[] = { }; #undef s -static void ah_init(struct xt_entry_match *m) -{ - struct ip6t_ah *ahinfo = (struct ip6t_ah *)m->data; - - ahinfo->spis[1] = 0xFFFFFFFF; -} - static void ah_parse(struct xt_option_call *cb) { struct ip6t_ah *ahinfo = cb->data; @@ -42,6 +35,8 @@ static void ah_parse(struct xt_option_call *cb) xtables_option_parse(cb); switch (cb->entry->id) { case O_AHSPI: + if (cb->nvals == 1) + ahinfo->spis[1] = ahinfo->spis[0]; if (cb->invert) ahinfo->invflags |= IP6T_AH_INV_SPI; break; @@ -132,7 +127,6 @@ static struct xtables_match ah_mt6_reg = { .size = XT_ALIGN(sizeof(struct ip6t_ah)), .userspacesize = XT_ALIGN(sizeof(struct ip6t_ah)), .help = ah_help, - .init = ah_init, .print = ah_print, .save = ah_save, .x6_parse = ah_parse, |