X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..eb157882d544cef011402d332a3625330c62668d:/modules/m_chghost.c

diff --git a/modules/m_chghost.c b/modules/m_chghost.c
index fcf87a8..57bffa9 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"
 
@@ -48,7 +45,7 @@ struct Message chghost_msgtab = {
 
 mapi_clist_av1 chghost_clist[] = { &chghost_msgtab, &realhost_msgtab, NULL };
 
-DECLARE_MODULE_AV1(chghost, NULL, NULL, chghost_clist, NULL, NULL, "$Revision: 1865 $");
+DECLARE_MODULE_AV1(chghost, NULL, NULL, chghost_clist, NULL, NULL, "$Revision: 3424 $");
 
 /* clean_host()
  *
@@ -60,6 +57,9 @@ static int
 clean_host(const char *host)
 {
 	int len = 0;
+	
+	if (*host == '\0' || *host == ':')
+		return 0;
 
 	for(; *host; host++)
 	{
@@ -77,7 +77,6 @@ clean_host(const char *host)
 
 /*
  * me_realhost
- * parv[0] = origin
  * parv[1] = real host
  *
  * Yes this contains a little race condition if someone does a whois
@@ -93,7 +92,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], HOSTLEN);
+	rb_strlcpy(source_p->orighost, parv[1], sizeof source_p->orighost);
 	if (irccmp(source_p->host, source_p->orighost))
 		SetDynSpoof(source_p);
 	else
@@ -140,7 +139,6 @@ do_chghost(struct Client *source_p, struct Client *target_p,
 
 /*
  * ms_chghost
- * parv[0] = origin
  * parv[1] = target
  * parv[2] = host
  */
@@ -161,9 +159,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;
@@ -171,7 +166,6 @@ ms_chghost(struct Client *client_p, struct Client *source_p,
 
 /*
  * me_chghost
- * parv[0] = origin
  * parv[1] = target
  * parv[2] = host
  */
@@ -191,7 +185,6 @@ me_chghost(struct Client *client_p, struct Client *source_p,
 
 /*
  * mo_chghost
- * parv[0] = origin
  * parv[1] = target
  * parv[2] = host
  */
@@ -233,11 +226,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;