X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/7ab1bb39ab038cd1061ecfb4b437c748b51a29d7..157c1f04bd3b04cbdcef5efb3cb280d0e10f1e7f:/src/client.c

diff --git a/src/client.c b/src/client.c
index b76caf4..534bec2 100644
--- a/src/client.c
+++ b/src/client.c
@@ -424,10 +424,10 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
 	const char *reason = NULL;
 	const char *exit_reason = conn_closed;
 
-	if(ConfigFileEntry.kline_with_reason && !EmptyString(aconf->passwd))
+	if(ConfigFileEntry.kline_with_reason)
 	{
-		reason = aconf->passwd;
-		exit_reason = aconf->passwd;
+		reason = get_user_ban_reason(aconf);
+		exit_reason = reason;
 	}
 	else
 	{
@@ -1957,7 +1957,7 @@ user_metadata_add(struct Client *target, const char *name, const char *value, in
 	
 	if(propegate)
 		sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA ADD %s %s :%s",
-				target->name, name, value);
+				target->id, name, value);
 
 	return md;
 }
@@ -1985,7 +1985,7 @@ user_metadata_delete(struct Client *target, const char *name, int propegate)
 
 	if(propegate)
 		sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA DELETE %s %s",
-				target->name, name);
+				target->id, name);
 }
 
 /*