Prevent cork usage as charybdis doesn't have its support

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

diff --git a/modules/m_kline.c b/modules/m_kline.c
index 68fe587b8b065dce3698e73dd67a8503b2ddfa42..faa6ad795f0f3e47e65c3206edd4a9cc60e1e5bf 100644 (file)
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
@@ -35,7 +34,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -45,7 +43,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "event.h"
 #include "reject.h"
 
 static int mo_kline(struct Client *, struct Client *, int, const char **);
@@ -163,7 +160,7 @@ mo_kline(struct Client *client_p, struct Client *source_p,
                        return 0;
        }
        /* if we have cluster servers, send it to them.. */
-       else if(dlink_list_length(&cluster_conf_list) > 0)
+       else if(rb_dlink_list_length(&cluster_conf_list) > 0)
                cluster_generic(source_p, "KLINE", 
                                (tkline_time > 0) ? SHARED_TKLINE : SHARED_PKLINE, CAP_KLN,
                                "%lu %s %s :%s",
@@ -181,8 +178,8 @@ mo_kline(struct Client *client_p, struct Client *source_p,
        current_date = smalldate();
        aconf = make_conf();
        aconf->status = CONF_KILL;
-       DupString(aconf->host, host);
-       DupString(aconf->user, user);
+       aconf->host = rb_strdup(host);
+       aconf->user = rb_strdup(user);
        aconf->port = 0;
 
        /* Look for an oper reason */
@@ -192,21 +189,21 @@ mo_kline(struct Client *client_p, struct Client *source_p,
                oper_reason++;
 
                if(!EmptyString(oper_reason))
-                       DupString(aconf->spasswd, oper_reason);
+                       aconf->spasswd = rb_strdup(oper_reason);
        }
 
        if(tkline_time > 0)
        {
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                           "Temporary K-line %d min. - %s (%s)",
                           (int) (tkline_time / 60), reason, current_date);
-               DupString(aconf->passwd, buffer);
+               aconf->passwd = rb_strdup(buffer);
                apply_tkline(source_p, aconf, reason, oper_reason, current_date, tkline_time);
        }
        else
        {
-               ircsnprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
-               DupString(aconf->passwd, buffer);
+               rb_snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
+               aconf->passwd = rb_strdup(buffer);
                apply_kline(source_p, aconf, reason, oper_reason, current_date);
        }
 
@@ -214,7 +211,7 @@ mo_kline(struct Client *client_p, struct Client *source_p,
        {
                if(kline_queued == 0)
                {
-                       eventAddOnce("check_klines", check_klines_event, NULL,
+                       rb_event_addonce("check_klines", check_klines_event, NULL,
                                     ConfigFileEntry.kline_delay);
                        kline_queued = 1;
                }
@@ -296,8 +293,8 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
        aconf = make_conf();
 
        aconf->status = CONF_KILL;
-       DupString(aconf->user, user);
-       DupString(aconf->host, host);
+       aconf->user = rb_strdup(user);
+       aconf->host = rb_strdup(host);
 
        /* Look for an oper reason */
        if((oper_reason = strchr(reason, '|')) != NULL)
@@ -306,23 +303,23 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
                oper_reason++;
 
                if(!EmptyString(oper_reason))
-                       DupString(aconf->spasswd, oper_reason);
+                       aconf->spasswd = rb_strdup(oper_reason);
        }
 
        current_date = smalldate();
 
        if(tkline_time > 0)
        {
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                           "Temporary K-line %d min. - %s (%s)",
                           (int) (tkline_time / 60), reason, current_date);
-               DupString(aconf->passwd, buffer);
+               aconf->passwd = rb_strdup(buffer);
                apply_tkline(source_p, aconf, reason, oper_reason, current_date, tkline_time);
        }
        else
        {
-               ircsnprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
-               DupString(aconf->passwd, buffer);
+               rb_snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
+               aconf->passwd = rb_strdup(buffer);
                apply_kline(source_p, aconf, reason, oper_reason, current_date);
        }
 
@@ -330,7 +327,7 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
        {
                if(kline_queued == 0)
                {
-                       eventAddOnce("check_klines", check_klines_event, NULL,
+                       rb_event_addonce("check_klines", check_klines_event, NULL,
                                     ConfigFileEntry.kline_delay);
                        kline_queued = 1;
                }
@@ -409,7 +406,7 @@ mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha
                if(match(parv[3], me.name) == 0)
                        return 0;
        }
-       else if(dlink_list_length(&cluster_conf_list) > 0)
+       else if(rb_dlink_list_length(&cluster_conf_list) > 0)
                cluster_generic(source_p, "UNKLINE", SHARED_UNKLINE, CAP_UNKLN,
                                "%s %s", user, host);
 
@@ -511,7 +508,7 @@ static void
 apply_tkline(struct Client *source_p, struct ConfItem *aconf,
             const char *reason, const char *oper_reason, const char *current_date, int tkline_time)
 {
-       aconf->hold = CurrentTime + tkline_time;
+       aconf->hold = rb_current_time() + tkline_time;
        add_temp_kline(aconf);
 
        /* no oper reason.. */
@@ -768,7 +765,7 @@ remove_permkline_match(struct Client *source_p, struct ConfItem *aconf)
        host = aconf->host;
        user = aconf->user;
 
-       ircsnprintf(temppath, sizeof(temppath),
+       rb_snprintf(temppath, sizeof(temppath),
                 "%s.tmp", ConfigFileEntry.klinefile);
 
        filename = get_conf_name(KLINE_TYPE);
@@ -912,12 +909,12 @@ flush_write(struct Client *source_p, FILE * out, const char *buf, const char *te
 static int
 remove_temp_kline(struct Client *source_p, struct ConfItem *aconf)
 {
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        int i;
 
        for (i = 0; i < LAST_TEMP_TYPE; i++)
        {
-               DLINK_FOREACH(ptr, temp_klines[i].head)
+               RB_DLINK_FOREACH(ptr, temp_klines[i].head)
                {
                        if (aconf == ptr->data)
                        {
@@ -931,7 +928,7 @@ remove_temp_kline(struct Client *source_p, struct ConfItem *aconf)
                                ilog(L_KLINE, "UK %s %s %s",
                                        get_oper_name(source_p),
                                        aconf->user, aconf->host);
-                               dlinkDestroy(ptr, &temp_klines[i]);
+                               rb_dlinkDestroy(ptr, &temp_klines[i]);
                                remove_reject_mask(aconf->user, aconf->host);
                                delete_one_address_conf(aconf->host, aconf);
                                return YES;