Skip to contentSkip to conversation

extensions: libebt_log: Avoid empty log-prefix in output

PATCH New Phil Sutter 1 participant 1 message Oct 5, 2022 netfilter

lore
Share & tools
lore

Phil Sutter

author reviewer
#0 lore raw

PATCH 1/1 extensions: libebt_log: Avoid empty log-prefix in output

Just like iptables LOG target, omit --log-prefix from output if the string is empty.

---
 extensions/libebt_log.c | 7 ++++---
 extensions/libebt_log.t | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
extensions/libebt_log.c +4 -3
index 8858cf0e22c00..47708d79310e0 100644
@@ -161,9 +161,10 @@ static void brlog_print(const void *ip, const struct xt_entry_target *target,
 {
 	struct ebt_log_info *loginfo = (struct ebt_log_info *)target->data;
 
-	printf("--log-level %s --log-prefix \"%s\"",
-		eight_priority[loginfo->loglevel].c_name,
-		loginfo->prefix);
+	printf("--log-level %s", eight_priority[loginfo->loglevel].c_name);
+
+	if (loginfo->prefix[0])
+		printf(" --log-prefix \"%s\"", loginfo->prefix);
 
 	if (loginfo->bitmask & EBT_LOG_IP)
 		printf(" --log-ip");
extensions/libebt_log.t +2 -2
index a0df6169112a0..f7116c417b0ab 100644
@@ -1,6 +1,6 @@
 :INPUT,FORWARD,OUTPUT
 --log;=;OK
 --log-level crit;=;OK
---log-level 1;--log-level alert --log-prefix "";OK
---log-level emerg --log-ip --log-arp --log-ip6;--log-level emerg --log-prefix "" --log-ip --log-arp --log-ip6 -j CONTINUE;OK
+--log-level 1;--log-level alert;OK
+--log-level emerg --log-ip --log-arp --log-ip6;=;OK
 --log-level crit --log-ip --log-arp --log-ip6 --log-prefix foo;--log-level crit --log-prefix "foo" --log-ip --log-arp --log-ip6 -j CONTINUE;OK
Signature · 1 line
2.34.1