From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [libnftnl PATCH] Partially revert "rule, set_elem: remove trailing \n in userdata snprintf"
Date: Tue, 1 Oct 2024 13:20:54 +0200 [thread overview]
Message-ID: <20241001112054.16616-1-phil@nwl.cc> (raw)
This reverts the rule-facing part of commit
c759027a526ac09ce413dc88c308a4ed98b33416.
It can't be right: Rules without userdata are printed with a trailing
newline, so this commit made behaviour inconsistent.
Fixes: c759027a526ac ("rule, set_elem: remove trailing \n in userdata snprintf")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
src/rule.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/rule.c b/src/rule.c
index 811d5a213f835..51d778d095317 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -601,7 +601,7 @@ static int nftnl_rule_snprintf_default(char *buf, size_t remain,
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
- ret = snprintf(buf + offset, remain, " }");
+ ret = snprintf(buf + offset, remain, " }\n");
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
--
2.43.0
next reply other threads:[~2024-10-01 11:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-01 11:20 Phil Sutter [this message]
2024-10-01 11:23 ` [libnftnl PATCH] Partially revert "rule, set_elem: remove trailing \n in userdata snprintf" Pablo Neira Ayuso
2024-10-01 12:39 ` Phil Sutter
2024-10-01 12:47 ` Pablo Neira Ayuso
2024-10-01 14:05 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241001112054.16616-1-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).