From 9e80487270b8dbd8bb8370fdea43edd02da4c5f2 Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Tue, 25 Apr 2023 15:41:40 +0200
Subject: [PATCH] JSON-RPC: server_ban.del: more fixes for previous two commits
 (done)

---
 src/modules/rpc/server_ban.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/modules/rpc/server_ban.c b/src/modules/rpc/server_ban.c
index 47265ded0..9ab038417 100644
--- a/src/modules/rpc/server_ban.c
+++ b/src/modules/rpc/server_ban.c
@@ -201,6 +201,7 @@ RPC_CALL_FUNC(rpc_server_ban_del)
 	const char *name, *type_name;
 	const char *set_by;
 	char *usermask, *hostmask;
+	char usermask_mess[256];
 	int soft;
 	TKL *tkl;
 	char tkl_type_char;
@@ -234,7 +235,16 @@ RPC_CALL_FUNC(rpc_server_ban_del)
 
 	tkllayer[1] = "-";
 	tkllayer[2] = tkl_type_str;
-	tkllayer[3] = usermask;
+	if (soft)
+	{
+		/* I don't like this fiddling.
+		 * It will be gone when we move from cmd_tkl() to a real function though.
+		 */
+		snprintf(usermask_mess, sizeof(usermask_mess), "%%%s", usermask);
+		tkllayer[3] = usermask_mess;
+	} else {
+		tkllayer[3] = usermask;
+	}
 	tkllayer[4] = hostmask;
 	tkllayer[5] = set_by;
 	tkllayer[6] = NULL;