Importing ratbox3 r25213 changeset

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

diff --git a/modules/m_resv.c b/modules/m_resv.c
index d1e11fccf7fa0ae5e883eb322ffb8b6ec3c6913c..9d46750c7bcc6214181f00699c4c5bc662ebf8ed 100644 (file)
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -36,7 +36,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "hash.h"
-#include "s_log.h"
+#include "logger.h"
 #include "sprintf_irc.h"
 
 static int mo_resv(struct Client *, struct Client *, int, const char **);
@@ -224,13 +224,13 @@ parse_resv(struct Client *source_p, const char *name,
                aconf = make_conf();
                aconf->status = CONF_RESV_CHANNEL;
                aconf->port = 0;
-               DupString(aconf->name, name);
-               DupString(aconf->passwd, reason);
+               aconf->name = rb_strdup(name);
+               aconf->passwd = rb_strdup(reason);
                add_to_resv_hash(aconf->name, aconf);
 
                if(temp_time > 0)
                {
-                       aconf->hold = CurrentTime + temp_time;
+                       aconf->hold = rb_current_time() + temp_time;
 
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "%s added temporary %d min. RESV for [%s] [%s]",
@@ -282,13 +282,13 @@ parse_resv(struct Client *source_p, const char *name,
                aconf = make_conf();
                aconf->status = CONF_RESV_NICK;
                aconf->port = 0;
-               DupString(aconf->name, name);
-               DupString(aconf->passwd, reason);
-               dlinkAddAlloc(aconf, &resv_conf_list);
+               aconf->name = rb_strdup(name);
+               aconf->passwd = rb_strdup(reason);
+               rb_dlinkAddAlloc(aconf, &resv_conf_list);
 
                if(temp_time > 0)
                {
-                       aconf->hold = CurrentTime + temp_time;
+                       aconf->hold = rb_current_time() + temp_time;
 
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "%s added temporary %d min. RESV for [%s] [%s]",