diff options
| author | Arturo Borrero Gonzalez <arturo@netfilter.org> | 2020-06-16 11:20:42 +0200 |
|---|---|---|
| committer | Arturo Borrero Gonzalez <arturo@netfilter.org> | 2020-06-16 11:20:42 +0200 |
| commit | 2757c0b5e5fbbf569695469b331453cecefdf069 (patch) | |
| tree | 2c264d452026e6a8f142a8438e11bef8c7364c96 | |
| parent | 848b4889274edb2ec6ef6218f3d8b55288dc4151 (diff) | |
xtables-translate: don't fail if help was requested
If the user called `iptables-translate -h` then we have CMD_NONE and we should gracefully handle
this case in do_command_xlate().
Before this patch, you would see:
user@debian:~$ sudo iptables-translate -h
[..]
nft Unsupported command?
user@debian:~$ echo $?
1
After this patch:
user@debian:~$ sudo iptables-translate -h
[..]
user@debian:~$ echo $?
0
Fixes: d4409d449c10fa ("nft: Don't exit early after printing help texts")
Acked-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
| -rw-r--r-- | iptables/xtables-translate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/iptables/xtables-translate.c b/iptables/xtables-translate.c index 5aa42496..363c8be1 100644 --- a/iptables/xtables-translate.c +++ b/iptables/xtables-translate.c @@ -249,7 +249,7 @@ static int do_command_xlate(struct nft_handle *h, int argc, char *argv[], cs.restore = restore; - if (!restore) + if (!restore && p.command != CMD_NONE) printf("nft "); switch (p.command) { @@ -310,6 +310,9 @@ static int do_command_xlate(struct nft_handle *h, int argc, char *argv[], break; case CMD_SET_POLICY: break; + case CMD_NONE: + ret = 1; + break; default: /* We should never reach this... */ printf("Unsupported command?\n"); |