m_pass.c fixed

[irc/rqf/shadowircd.git] / modules / m_services.c

diff --git a/modules/m_services.c b/modules/m_services.c
index 72250e247c2c3f262cea64188470ce238f0d54f7..af0e9c30d93790a4c228fdef0f40a3f1adbac287 100644 (file)
--- 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"
@@ -154,6 +152,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;
@@ -205,8 +204,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;
 
@@ -237,7 +236,8 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 
        del_all_accepts(target_p);
 
-       comm_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;
 }
 
@@ -270,7 +270,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;