From: Phil Sutter Date: Wed, 16 Oct 2019 22:20:59 +0000 (+0200) Subject: rule: Fix for single line ct timeout printing X-Git-Tag: v0.9.3~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb050d7799abfd6bda6c21ad78ed5d9d2c92132f;p=thirdparty%2Fnftables.git rule: Fix for single line ct timeout printing Commit 43ae7a48ae3de ("rule: do not print semicolon in ct timeout") removed an extra semicolon at end of line, but thereby broke single line output. The correct fix is to use opts->stmt_separator which holds either newline or semicolon chars depending on output mode. Fixes: 43ae7a48ae3de ("rule: do not print semicolon in ct timeout") Signed-off-by: Phil Sutter Acked-by: Florian Westphal --- diff --git a/src/rule.c b/src/rule.c index 2d35bae4..3c7c8d63 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1869,7 +1869,7 @@ static void obj_print_data(const struct obj *obj, nft_print(octx, "%s", opts->nl); nft_print(octx, "%s%sprotocol ", opts->tab, opts->tab); print_proto_name_proto(obj->ct_timeout.l4proto, octx); - nft_print(octx, "%s", opts->nl); + nft_print(octx, "%s", opts->stmt_separator); nft_print(octx, "%s%sl3proto %s%s", opts->tab, opts->tab, family2str(obj->ct_timeout.l3proto),