diff options
Diffstat (limited to 'iptables')
-rwxr-xr-x | iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 | 6 | ||||
-rwxr-xr-x | iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 | 4 | ||||
-rw-r--r-- | iptables/xtables-eb.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 b/iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 index 1de76840..eeb7d835 100755 --- a/iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 +++ b/iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 @@ -84,15 +84,15 @@ DUMP='*filter -A foo -p IPv6 --ip6-src feed:babe::1 -j ACCEPT -A foo -p IPv6 --ip6-dst feed:babe::/64 -j ACCEPT -A foo -p IPv6 --ip6-proto tcp -j ACCEPT --A foo --limit 100/second --limit-burst 42 -j ACCEPT +-A foo --limit 100/sec --limit-burst 42 -j ACCEPT -A foo --log-level notice --log-prefix "" -j CONTINUE -A foo -j mark --mark-set 0x23 --mark-target ACCEPT -A foo --nflog-group 1 -j CONTINUE -A foo --pkttype-type multicast -j ACCEPT -A foo --stp-type config -j ACCEPT --A foo --802_3-sap 0x23 --limit 100/second --limit-burst 5 -j ACCEPT +-A foo --802_3-sap 0x23 --limit 100/sec --limit-burst 5 -j ACCEPT -A foo --pkttype-type multicast --log-level notice --log-prefix "" -j CONTINUE --A foo --pkttype-type multicast --limit 100/second --limit-burst 5 -j ACCEPT +-A foo --pkttype-type multicast --limit 100/sec --limit-burst 5 -j ACCEPT *nat :PREROUTING ACCEPT diff --git a/iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 b/iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 index d82bae54..c8580547 100755 --- a/iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 +++ b/iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 @@ -22,8 +22,8 @@ EXPECT='*filter :INPUT ACCEPT :FORWARD ACCEPT :OUTPUT ACCEPT --A FORWARD --limit 100/second --limit-burst 42 -j ACCEPT --A FORWARD --limit 1000/second --limit-burst 5 -j ACCEPT +-A FORWARD --limit 100/sec --limit-burst 42 -j ACCEPT +-A FORWARD --limit 1000/sec --limit-burst 5 -j ACCEPT -A FORWARD --log-level notice --log-prefix "foobar" -j CONTINUE -A FORWARD --log-level notice --log-prefix "" -j CONTINUE ' diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index 798c027c..a46b9e5a 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -1199,7 +1199,10 @@ print_zero: /* Is it a match_option? */ for (m = xtables_matches; m; m = m->next) { - if (m->parse(c - m->option_offset, argv, ebt_check_inverse2(optarg, argc, argv), &m->mflags, NULL, &m->m)) { + if (m->parse && + m->parse(c - m->option_offset, argv, + ebt_check_inverse2(optarg, argc, argv), + &m->mflags, NULL, &m->m)) { ebt_add_match(m, &cs); goto check_extension; } |