diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-09-05 19:14:40 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-09-10 15:27:33 +0200 |
| commit | 9242b5d9341434a5ae1491f64802df6926340d20 (patch) | |
| tree | ffb72e9ed4e4d6a3d9f2380721f5202eb13fde7f /iptables | |
| parent | c9f4f04bafe36927d2bca7ecf717723e0d7410d7 (diff) | |
xtables: Accept --wait in iptables-nft-restore
Passing --wait option to iptables-nft-restore led to program abort
because the flag parameter was not skipped. Mimick iptables-restore
behaviour when encountering --wait or --wait-interval options (but still
ignore the parameter).
Fixes: b9d7b49d84bc2 ("xtables-compat: restore: sync options with iptables-restore")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables')
| -rwxr-xr-x | iptables/tests/shell/testcases/ipt-restore/0002-parameters_0 | 21 | ||||
| -rw-r--r-- | iptables/xtables-restore.c | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/iptables/tests/shell/testcases/ipt-restore/0002-parameters_0 b/iptables/tests/shell/testcases/ipt-restore/0002-parameters_0 new file mode 100755 index 00000000..5c8748ec --- /dev/null +++ b/iptables/tests/shell/testcases/ipt-restore/0002-parameters_0 @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +# make sure wait and wait-interval options are accepted + +clean_tempfile() +{ + if [ -n "${tmpfile}" ]; then + rm -f "${tmpfile}" + fi +} + +trap clean_tempfile EXIT + +tmpfile=$(mktemp) || exit 1 + +$XT_MULTI iptables-save -f $tmpfile +$XT_MULTI iptables-restore $tmpfile +$XT_MULTI iptables-restore -w 5 $tmpfile +$XT_MULTI iptables-restore -w 5 -W 1 $tmpfile diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c index d187b129..9d15593f 100644 --- a/iptables/xtables-restore.c +++ b/iptables/xtables-restore.c @@ -419,6 +419,8 @@ xtables_restore_main(int family, const char *progname, int argc, char *argv[]) break; case 'w': /* fallthrough. Ignored by xt-restore */ case 'W': + if (!optarg && xs_has_arg(argc, argv)) + optind++; break; default: fprintf(stderr, |