use an rpath to avoid LD_LIBRARY_PATH stuff

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

diff --git a/src/s_user.c b/src/s_user.c
index f68c763acf0669bbd758954833c312161e49582a..2428c856a71992d19ecd931f7c765e7d5c6db7b2 100644 (file)
--- 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;
 
@@ -293,10 +290,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        /* Apply nick override */
        if(*source_p->preClient->spoofnick)
        {
+               char note[NICKLEN + 10];
+
                del_from_client_hash(source_p->name, source_p);
                strlcpy(source_p->name, source_p->preClient->spoofnick, NICKLEN + 1);
                add_to_client_hash(source_p->name, source_p);
-               rb_note(source_p->localClient->F->fd, "Nick: %s", source_p->name);
+
+               rb_snprintf(note, NICKLEN + 10, "Nick: %s", source_p->name);
+               rb_note(source_p->localClient->F, note);
        }
 
        if(!valid_hostname(source_p->host))
@@ -380,7 +381,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 +677,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 +991,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);
@@ -1183,7 +1184,7 @@ send_umode_out(struct Client *client_p, struct Client *source_p, int old)
 
        send_umode(NULL, source_p, old, 0, buf);
 
-       DLINK_FOREACH(ptr, serv_list.head)
+       RB_DLINK_FOREACH(ptr, serv_list.head)
        {
                target_p = ptr->data;
 
@@ -1277,7 +1278,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);
@@ -1398,7 +1399,7 @@ change_nick_user_host(struct Client *target_p,    const char *nick, const char *use
                                target_p->name, target_p->username, target_p->host,
                                reason);
 
-               DLINK_FOREACH(ptr, target_p->user->channel.head)
+               RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
                {
                        mscptr = ptr->data;
                        chptr = mscptr->chptr;