diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-10-22 12:25:28 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-10-23 10:58:09 +0200 |
| commit | 4e470fa34761085144640fb561a9ad26b2cde382 (patch) | |
| tree | 70722e0e5e003fa2a764c8e8a251112bc41f02e4 /iptables/iptables.c | |
| parent | 3dc433b55bbfaf9df3ee408aaa6282742f377864 (diff) | |
xtables-restore: Unbreak *tables-restore
Commit 3dc433b55bbfa ("xtables-restore: Fix --table parameter check")
installed an error check which evaluated true in all cases as all
callers of do_command callbacks pass a pointer to a table name already.
Attached test case passed as it tested error condition only.
Fix the whole mess by introducing a boolean to indicate whether a table
parameter was seen already. Extend the test case to cover positive as
well as negative behaviour and to test ebtables-restore and
ip6tables-restore as well. Also add the required checking code to the
latter since the original commit missed it.
Fixes: 3dc433b55bbfa ("xtables-restore: Fix --table parameter check")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/iptables.c')
| -rw-r--r-- | iptables/iptables.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/iptables/iptables.c b/iptables/iptables.c index d7a41321..544e8759 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -1217,6 +1217,7 @@ int do_command4(int argc, char *argv[], char **table, struct xtables_rule_match *matchp; struct xtables_target *t; unsigned long long cnt; + bool table_set = false; /* re-set optind to 0 in case do_command4 gets called * a second time */ @@ -1494,11 +1495,12 @@ int do_command4(int argc, char *argv[], char **table, if (cs.invert) xtables_error(PARAMETER_PROBLEM, "unexpected ! flag before --table"); - if (restore && *table) + if (restore && table_set) xtables_error(PARAMETER_PROBLEM, "The -t option (seen in line %u) cannot be used in %s.\n", line, xt_params->program_name); *table = optarg; + table_set = true; break; case 'x': |