From: Florian Westphal Date: Wed, 18 Oct 2017 23:03:20 +0000 (+0200) Subject: rule: fix netlink debug flag when listing table/rules X-Git-Tag: v0.8.1~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9504cfceca4e9ef8b16be748e92fdc20c10750db;p=thirdparty%2Fnftables.git rule: fix netlink debug flag when listing table/rules nft --debug=netlink list table ... has no effect anymore. Callers pass in debug_mask & DEBUG_NETLINK, which gets converted to 0/1 because the arg is a boolean. Later on this bool is converted back to an integer, but that won't have the desired result. Fixes: be441e1ffdc24 ("src: add debugging mask to context structure") Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- diff --git a/src/rule.c b/src/rule.c index d744cf61..d83284e5 100644 --- a/src/rule.c +++ b/src/rule.c @@ -123,7 +123,7 @@ static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd) static int cache_init(struct mnl_socket *nf_sock, struct nft_cache *cache, enum cmd_ops cmd, struct list_head *msgs, - unsigned int debug_mask, struct output_ctx *octx) + bool debug, struct output_ctx *octx) { struct handle handle = { .family = NFPROTO_UNSPEC, @@ -134,7 +134,7 @@ static int cache_init(struct mnl_socket *nf_sock, struct nft_cache *cache, .cache = cache, .msgs = msgs, .seqnum = cache->seqnum++, - .debug_mask = debug_mask, + .debug_mask = debug ? DEBUG_NETLINK : 0, .octx = octx, }; int ret;