diff options
author | Phil Sutter <phil@nwl.cc> | 2020-08-07 13:48:28 +0200 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2020-08-14 09:00:08 +0200 |
commit | 3be40dcfb5af1438b6abdbda45a1e3b59c104e13 (patch) | |
tree | b900b53731aaac9ab8d6c1f702ca5d443a93e956 /iptables | |
parent | 27d01216cf05eb0b49b6456137e01a44d4547796 (diff) |
nft: Fix command name in ip6tables error message
Upon errors, ip6tables-nft would prefix its error messages with
'iptables:' instead of 'ip6tables:'. Turns out the command name was
hard-coded, use 'progname' variable instead.
While being at it, merge the two mostly identical fprintf() calls into
one.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables')
-rw-r--r-- | iptables/xtables-standalone.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/iptables/xtables-standalone.c b/iptables/xtables-standalone.c index dd6fb791..7b71db62 100644 --- a/iptables/xtables-standalone.c +++ b/iptables/xtables-standalone.c @@ -75,14 +75,10 @@ xtables_main(int family, const char *progname, int argc, char *argv[]) xtables_fini(); if (!ret) { - if (errno == EINVAL) { - fprintf(stderr, "iptables: %s. " - "Run `dmesg' for more information.\n", - nft_strerror(errno)); - } else { - fprintf(stderr, "iptables: %s.\n", - nft_strerror(errno)); - } + fprintf(stderr, "%s: %s.%s\n", progname, nft_strerror(errno), + (errno == EINVAL ? + " Run `dmesg' for more information." : "")); + if (errno == EAGAIN) exit(RESOURCE_PROBLEM); } |