X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8e69bb4e903f428b14e2950cce9be39dc8ddd12c..6e9b4415cce8808ad39f90612f0218274f3cb1c1:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 8c7a920..a9537d0 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "s_user.h"
 #include "channel.h"
 #include "class.h"
@@ -38,7 +37,6 @@
 #include "listener.h"
 #include "msg.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -48,7 +46,6 @@
 #include "send.h"
 #include "supported.h"
 #include "whowas.h"
-#include "memory.h"
 #include "packet.h"
 #include "reject.h"
 #include "cache.h"
@@ -264,7 +261,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	if(rb_dlink_list_length(&source_p->preClient->dnsbl_queries) > 0)
 		return -1;
 
-	client_p->localClient->last = CurrentTime;
+	client_p->localClient->last = rb_current_time();
 	/* Straight up the maximum rate of flooding... */
 	source_p->localClient->allow_read = MAX_FLOOD_BURST;
 
@@ -380,7 +377,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		if(source_p->localClient->passwd)
 		{
 			memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
-			MyFree(source_p->localClient->passwd);
+			rb_free(source_p->localClient->passwd);
 			source_p->localClient->passwd = NULL;
 		}
 	}
@@ -676,7 +673,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 						source_p->localClient->passwd);
 		}
 		memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
-		MyFree(source_p->localClient->passwd);
+		rb_free(source_p->localClient->passwd);
 		source_p->localClient->passwd = NULL;
 	}
 
@@ -990,7 +987,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 					}
 					source_p->flags2 &= ~OPER_FLAGS;
 
-					MyFree(source_p->localClient->opername);
+					rb_free(source_p->localClient->opername);
 					source_p->localClient->opername = NULL;
 
 					rb_dlinkFindDestroy(source_p, &local_oper_list);
@@ -1277,7 +1274,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 	SetExemptKline(source_p);
 
 	source_p->flags2 |= oper_p->flags;
-	DupString(source_p->localClient->opername, oper_p->name);
+	source_p->localClient->opername = rb_strdup(oper_p->name);
 
 	rb_dlinkAddAlloc(source_p, &local_oper_list);
 	rb_dlinkAddAlloc(source_p, &oper_list);