X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/822a4a25378d7b4bf091d8c281fb4577d34c163f..8ee12f0c437eec8aa42af7b350c7e2a3ccafedbc:/modules/m_chghost.c

diff --git a/modules/m_chghost.c b/modules/m_chghost.c
index f4778e01..a4b4ce3e 100644
--- a/modules/m_chghost.c
+++ b/modules/m_chghost.c
@@ -10,7 +10,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -18,7 +17,6 @@
 #include "config.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
@@ -27,7 +25,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 
@@ -96,7 +93,7 @@ me_realhost(struct Client *client_p, struct Client *source_p,
 		return 0;
 
 	del_from_hostname_hash(source_p->orighost, source_p);
-	strlcpy(source_p->orighost, parv[1], sizeof source_p->orighost);
+	rb_strlcpy(source_p->orighost, parv[1], sizeof source_p->orighost);
 	if (irccmp(source_p->host, source_p->orighost))
 		SetDynSpoof(source_p);
 	else
@@ -164,9 +161,6 @@ ms_chghost(struct Client *client_p, struct Client *source_p,
 		sendto_server(client_p, NULL,
 			CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
 			use_id(source_p), use_id(target_p), parv[2]);
-		sendto_server(client_p, NULL,
-			NOCAPS, CAP_TS6, ":%s ENCAP * CHGHOST %s :%s",
-			source_p->name, target_p->name, parv[2]);
 	}
 
 	return 0;
@@ -236,11 +230,9 @@ mo_chghost(struct Client *client_p, struct Client *source_p,
 	sendto_server(NULL, NULL,
 		CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
 		use_id(source_p), use_id(target_p), parv[2]);
-	sendto_server(NULL, NULL,
-		NOCAPS, CAP_TS6, ":%s ENCAP * CHGHOST %s :%s",
-		source_p->name, target_p->name, parv[2]);
 #else
-	sendto_one_notice(source_p, ":CHGHOST is disabled");
+	sendto_one_numeric(source_p, ERR_DISABLED, form_str(ERR_DISABLED),
+			"CHGHOST");
 #endif
 
 	return 0;