ok, trying to work on blockheap's stuff

[irc/rqf/shadowircd.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 073009347767b180b5d1fef74bf6e387f575eada..a9537d0554fc6df97582931b89b8a6fc765f3f2c 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -261,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;
 
@@ -377,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;
                }
        }
@@ -673,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;
        }
 
@@ -987,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);
@@ -1274,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);