On Thu, Oct 17, 2019 at 01:03:22AM +0200, Phil Sutter wrote:
> 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.
What output mode this breaks? It looks indeed like I overlook
something while fixing up this.
Thanks.
> Fixes: 43ae7a48ae3de ("rule: do not print semicolon in ct timeout")
> Signed-off-by: Phil Sutter <[email protected]>
> ---
> src/rule.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/rule.c b/src/rule.c
> index 2d35bae44c9e5..3c7c8d63f8cdf 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),
> --
> 2.23.0
>
