cmd: typo in chain fuzzy lookup

Refer to chain, not table.

Error: No such file or directory; did you mean table ‘z’ in family ip?
add chain x y { type filter nat prerouting priority dstnat; }
            ^

It should say instead:

Error: No such file or directory; did you mean chain ‘z’ in table ip ‘x’?

[ Florian added args check for fmt to the netlink_io_error() prototype. ]

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/netlink.h b/include/netlink.h
index a7c524ca96749266c7a87a5710da6ae9295f81f5..0c8655ca19cfeb54fe1dbdb837b9cb0ce5434e3a 100644 (file)
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -181,7 +181,7 @@ extern void netlink_dump_flowtable(struct nftnl_flowtable *flo, struct netlink_c
        __netlink_abi_error(__FILE__, __LINE__, strerror(errno));
 extern void __noreturn __netlink_abi_error(const char *file, int line, const char *reason);
 extern int netlink_io_error(struct netlink_ctx *ctx,
-                           const struct location *loc, const char *fmt, ...);
+                           const struct location *loc, const char *fmt, ...) __attribute__((format(printf, 3, 4)));
 #define netlink_init_error()   \
        __netlink_init_error(__FILE__, __LINE__, strerror(errno));
 extern void __noreturn __netlink_init_error(const char *file, int line, const char *reason);

diff --git a/src/cmd.c b/src/cmd.c
index f9716fccd513fe440b6e1fe05311c524e1c22b78..a647130ec8b4ad033f7cff270e5d383a7a52cb86 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -40,7 +40,7 @@ static int nft_cmd_enoent_chain(struct netlink_ctx *ctx, const struct cmd *cmd,
        if (!chain)
                return 0;
 
-       netlink_io_error(ctx, loc, "%s; did you mean table ‘%s’ in family %s?",
+       netlink_io_error(ctx, loc, "%s; did you mean chain ‘%s’ in table %s ‘%s’?",
                         strerror(ENOENT), chain->handle.chain.name,
                         family2str(table->handle.family),
                         table->handle.table.name);