From: Jilles Tjoelker <redacted>
Date: Fri, 5 Mar 2010 17:28:59 +0000 (+0100)
Subject: kline: Fix oper reasons.
X-Git-Tag: shadowircd-6.1.0~34^2~20
X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/commitdiff_plain/90072e8be6b3674ff6bf017fed9517740363e940?hp=dce31e272391c727bc3caa29ca6a6eb445a00fcb

kline: Fix oper reasons.
---

diff --git a/modules/m_kline.c b/modules/m_kline.c
index b1cc350..2056e4d 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -174,7 +174,6 @@ mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char
 	aconf->host = rb_strdup(host);
 	aconf->user = rb_strdup(user);
 	aconf->port = 0;
-	aconf->passwd = rb_strdup(reason);
 	aconf->info.oper = operhash_add(get_oper_name(source_p));
 
 	/* Look for an oper reason */
@@ -186,6 +185,7 @@ mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char
 		if(!EmptyString(oper_reason))
 			aconf->spasswd = rb_strdup(oper_reason);
 	}
+	aconf->passwd = rb_strdup(reason);
 
 	if(tkline_time > 0)
 		apply_tkline(source_p, aconf, reason, oper_reason, tkline_time);
@@ -277,7 +277,6 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
 	aconf->created = rb_current_time();
 	aconf->user = rb_strdup(user);
 	aconf->host = rb_strdup(host);
-	aconf->passwd = rb_strdup(reason);
 	aconf->info.oper = operhash_add(get_oper_name(source_p));
 
 	/* Look for an oper reason */
@@ -289,6 +288,7 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
 		if(!EmptyString(oper_reason))
 			aconf->spasswd = rb_strdup(oper_reason);
 	}
+	aconf->passwd = rb_strdup(reason);
 
 	if(tkline_time > 0)
 		apply_tkline(source_p, aconf, reason, oper_reason, tkline_time);