X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/68876ea24b3d1782d404a39989ad855b328e5304..8097430a810ac1535fe5304f74991b16ff58b064:/modules/m_signon.c

diff --git a/modules/m_signon.c b/modules/m_signon.c
index 5e56f24..f28021f 100644
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -44,12 +44,11 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 #include "s_stats.h"
 #include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_user.h"
 
 static int me_svslogin(struct Client *, struct Client *, int, const char **);
@@ -163,41 +162,41 @@ me_svslogin(struct Client *client_p, struct Client *source_p,
 
 	if(clean_nick(parv[2]))
 	{
-		strlcpy(nick, parv[2], NICKLEN + 1);
+		rb_strlcpy(nick, parv[2], NICKLEN + 1);
 		valid |= NICK_VALID;
 	}
 	else if(*target_p->name)
-		strlcpy(nick, target_p->name, NICKLEN + 1);
+		rb_strlcpy(nick, target_p->name, NICKLEN + 1);
 	else
 		strcpy(nick, "*");
 
 	if(clean_username(parv[3]))
 	{
-		strlcpy(user, parv[3], USERLEN + 1);
+		rb_strlcpy(user, parv[3], USERLEN + 1);
 		valid |= USER_VALID;
 	}
 	else
-		strlcpy(user, target_p->username, USERLEN + 1);
+		rb_strlcpy(user, target_p->username, USERLEN + 1);
 
 	if(clean_host(parv[4]))
 	{
-		strlcpy(host, parv[4], HOSTLEN + 1);
+		rb_strlcpy(host, parv[4], HOSTLEN + 1);
 		valid |= HOST_VALID;
 	}
 	else
-		strlcpy(host, target_p->host, HOSTLEN + 1);
+		rb_strlcpy(host, target_p->host, HOSTLEN + 1);
 
 	if(*parv[5] == '*')
 	{
 		if(target_p->user)
-			strlcpy(login, target_p->user->suser, NICKLEN + 1);
+			rb_strlcpy(login, target_p->user->suser, NICKLEN + 1);
 		else
 			login[0] = '\0';
 	}
 	else if(!strcmp(parv[5], "0"))
 		login[0] = '\0';
 	else
-		strlcpy(login, parv[5], NICKLEN + 1);
+		rb_strlcpy(login, parv[5], NICKLEN + 1);
 
 	/* Login (mostly) follows nick rules. */
 	if(*login && !clean_nick(login))
@@ -215,7 +214,7 @@ me_svslogin(struct Client *client_p, struct Client *source_p,
 		kill_client_serv_butone(NULL, exist_p, "%s (Nickname regained by services)",
 					me.name);
 
-		snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
+		rb_snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
 			me.name);
 		exit_client(NULL, exist_p, &me, buf);
 	}else if((exist_p = find_client(nick)) && IsUnknown(exist_p) && exist_p != target_p) {
@@ -251,7 +250,7 @@ me_svslogin(struct Client *client_p, struct Client *source_p,
 		if(valid & HOST_VALID)
 			strcpy(target_p->preClient->spoofhost, host);
 
-		strlcpy(user_p->suser, login, NICKLEN + 1);
+		rb_strlcpy(user_p->suser, login, NICKLEN + 1);
 	}
 	else
 	{
@@ -276,7 +275,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 
 	if(!clean_nick(parv[1]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				"Bad Nick from SIGNON: %s From: %s(via %s)",
 				parv[1], source_p->servptr->name, client_p->name);
@@ -294,7 +293,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 
 	if(!clean_username(parv[2]) || !clean_host(parv[3]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				"Bad user@host from SIGNON: %s@%s From: %s(via %s)",
 				parv[2], parv[3], source_p->servptr->name, client_p->name);
@@ -317,7 +316,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 	else if(*parv[5] != '*')
 	{
 		if (clean_nick(parv[5]))
-			strlcpy(login, parv[5], NICKLEN + 1);
+			rb_strlcpy(login, parv[5], NICKLEN + 1);
 		else
 			return 0;
 	}
@@ -338,13 +337,13 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 						     source_p->name, target_p->name, target_p->from->name,
 						     client_p->name);
 		
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 				sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 						   form_str(ERR_NICKCOLLISION), target_p->name);
 		
 				kill_client_serv_butone(NULL, source_p, "%s (Nick change collision)", me.name);
 		
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 		
 				kill_client_serv_butone(NULL, target_p, "%s (Nick change collision)", me.name);
 		
@@ -373,7 +372,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 								     source_p->name, target_p->name,
 								     target_p->from->name, client_p->name);
 		
-					ServerStats->is_kill++;
+					ServerStats.is_kill++;
 		
 					sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 							   form_str(ERR_NICKCOLLISION), target_p->name);
@@ -410,7 +409,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 					kill_client_serv_butone(client_p, target_p, 
 							"%s (Nick collision)", me.name);
 		
-					ServerStats->is_kill++;
+					ServerStats.is_kill++;
 		
 					target_p->flags |= FLAGS_KILLED;
 					(void) exit_client(client_p, target_p, &me, "Nick collision");
@@ -432,9 +431,6 @@ send_signon(struct Client *client_p, struct Client *target_p,
 	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s SIGNON %s %s %s %ld %s",
 			use_id(target_p), nick, user, host,
 			(long) target_p->tsinfo, *login ? login : "0");
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s SIGNON %s %s %s %ld %s",
-			target_p->name, nick, user, host,
-			(long) target_p->tsinfo, *login ? login : "0");
 
 	strcpy(target_p->user->suser, login);