libnftnl/backport-rule-set_elem-remove-trailing-n-in-userdata-snprintf.patch
sxt1001 55cf6c2413 sync community patch
(cherry picked from commit 143cf6569dcbeb0259e07778b2f8e41bde2f3fd5)
2023-05-29 10:03:32 +08:00

44 lines
1.3 KiB
Diff

From c759027a526ac09ce413dc88c308a4ed98b33416 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 31 Aug 2022 16:52:51 +0200
Subject: [PATCH] rule, set_elem: remove trailing \n in userdata snprintf
212479ad2c92 ("rule, set_elem: fix printing of user data") uncovered
another an extra line break in the userdata printing, remove it.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/rule.c | 2 +-
src/set_elem.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/rule.c b/src/rule.c
index a1a64bd..a52012b 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -628,7 +628,7 @@ static int nftnl_rule_snprintf_default(char *buf, size_t remain,
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
- ret = snprintf(buf + offset, remain, " }\n");
+ ret = snprintf(buf + offset, remain, " }");
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
diff --git a/src/set_elem.c b/src/set_elem.c
index 104719b..1c9a96b 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -744,7 +744,7 @@ int nftnl_set_elem_snprintf_default(char *buf, size_t remain,
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
- ret = snprintf(buf + offset, remain, " }\n");
+ ret = snprintf(buf + offset, remain, " }");
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
--
2.33.0