X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/38e6acddad741b38a475fe3d10dfffb3c6d6c639..8097430a810ac1535fe5304f74991b16ff58b064:/modules/m_services.c

diff --git a/modules/m_services.c b/modules/m_services.c
index 81326bf..c1536e3 100644
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -31,7 +31,6 @@
 
 #include "stdinc.h"
 
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -39,7 +38,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"
@@ -47,7 +45,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 
@@ -108,7 +105,7 @@ me_su(struct Client *client_p, struct Client *source_p,
 	if(EmptyString(parv[2]))
 		target_p->user->suser[0] = '\0';
 	else
-		strlcpy(target_p->user->suser, parv[2], sizeof(target_p->user->suser));
+		rb_strlcpy(target_p->user->suser, parv[2], sizeof(target_p->user->suser));
 
 	invalidate_bancache_user(target_p);
 
@@ -122,7 +119,7 @@ me_login(struct Client *client_p, struct Client *source_p,
 	if(!IsPerson(source_p))
 		return 0;
 
-	strlcpy(source_p->user->suser, parv[1], sizeof(source_p->user->suser));
+	rb_strlcpy(source_p->user->suser, parv[1], sizeof(source_p->user->suser));
 	return 0;
 }
 
@@ -154,6 +151,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 	struct Client *target_p;
 	struct Client *exist_p;
 	time_t newts, curts;
+	char note[NICKLEN + 10];
 
 	if(!(source_p->flags & FLAGS_SERVICE))
 		return 0;
@@ -197,7 +195,7 @@ me_rsfnc(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);
 	}
@@ -205,8 +203,8 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 	newts = atol(parv[3]);
 
 	/* timestamp is older than 15mins, ignore it */
-	if(newts < (CurrentTime - 900))
-		newts = CurrentTime - 900;
+	if(newts < (rb_current_time() - 900))
+		newts = rb_current_time() - 900;
 
 	target_p->tsinfo = newts;
 
@@ -226,8 +224,6 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 	add_history(target_p, 1);
 	sendto_server(NULL, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
 			use_id(target_p), parv[2], (long) target_p->tsinfo);
-	sendto_server(NULL, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-			target_p->name, parv[2], (long) target_p->tsinfo);
 
 	del_from_client_hash(target_p->name, target_p);
 	strcpy(target_p->name, parv[2]);
@@ -237,13 +233,13 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 
 	del_all_accepts(target_p);
 
-	rb_note(target_p->localClient->F->fd, "Nick: %s", target_p->name);
+	rb_snprintf(note, NICKLEN + 10, "Nick: %s", target_p->name);
+	rb_note(target_p->localClient->F, note);
 	return 0;
 }
 
 /*
 ** me_nickdelay
-**      parv[0] = sender prefix
 **      parv[1] = duration in seconds (0 to remove)
 **      parv[2] = nick
 */
@@ -270,7 +266,7 @@ me_nickdelay(struct Client *client_p, struct Client *source_p, int parc, const c
 		add_nd_entry(parv[2]);
 		nd = irc_dictionary_retrieve(nd_dict, parv[2]);
 		if (nd != NULL)
-			nd->expire = CurrentTime + duration;
+			nd->expire = rb_current_time() + duration;
 	}
 
 	return 0;