]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - src/newconf.c
s_log.* -> logger.* (s_foo looks ugly, lets try to get rid of it)
[irc/rqf/shadowircd.git] / src / newconf.c
index 48c61601ea6e75bfb49fc8833c6a06c43ab597b4..4981e44b72ce5159d62dc8241380cbde4034552d 100644 (file)
@@ -9,13 +9,11 @@
 #include <openssl/rsa.h>
 #endif
 
-#include "memory.h"
 #include "newconf.h"
-#include "tools.h"
 #include "ircd_defs.h"
 #include "sprintf_irc.h"
 #include "common.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "s_user.h"
 #include "s_newconf.h"
@@ -25,7 +23,6 @@
 #include "listener.h"
 #include "hostmask.h"
 #include "s_serv.h"
-#include "event.h"
 #include "hash.h"
 #include "cache.h"
 #include "ircd.h"
@@ -37,7 +34,7 @@
 struct TopConf *conf_cur_block;
 static char *conf_cur_block_name;
 
-static dlink_list conf_items;
+static rb_dlink_list conf_items;
 
 static struct ConfItem *yy_aconf = NULL;
 
@@ -46,10 +43,10 @@ static struct Class *yy_class = NULL;
 static struct remote_conf *yy_shared = NULL;
 static struct server_conf *yy_server = NULL;
 
-static dlink_list yy_aconf_list;
-static dlink_list yy_oper_list;
-static dlink_list yy_shared_list;
-static dlink_list yy_cluster_list;
+static rb_dlink_list yy_aconf_list;
+static rb_dlink_list yy_oper_list;
+static rb_dlink_list yy_shared_list;
+static rb_dlink_list yy_cluster_list;
 static struct oper_conf *yy_oper = NULL;
 
 static struct alias_entry *yy_alias = NULL;
@@ -83,24 +80,24 @@ add_top_conf(const char *name, int (*sfunc) (struct TopConf *),
 {
        struct TopConf *tc;
 
-       tc = MyMalloc(sizeof(struct TopConf));
+       tc = rb_malloc(sizeof(struct TopConf));
 
        tc->tc_name = name;
        tc->tc_sfunc = sfunc;
        tc->tc_efunc = efunc;
        tc->tc_entries = items;
 
-       dlinkAddAlloc(tc, &conf_items);
+       rb_dlinkAddAlloc(tc, &conf_items);
        return 0;
 }
 
 struct TopConf *
 find_top_conf(const char *name)
 {
-       dlink_node *d;
+       rb_dlink_node *d;
        struct TopConf *tc;
 
-       DLINK_FOREACH(d, conf_items.head)
+       RB_DLINK_FOREACH(d, conf_items.head)
        {
                tc = d->data;
                if(strcasecmp(tc->tc_name, name) == 0)
@@ -115,7 +112,7 @@ struct ConfEntry *
 find_conf_item(const struct TopConf *top, const char *name)
 {
        struct ConfEntry *cf;
-       dlink_node *d;
+       rb_dlink_node *d;
 
        if(top->tc_entries)
        {
@@ -130,7 +127,7 @@ find_conf_item(const struct TopConf *top, const char *name)
                }
        }
 
-       DLINK_FOREACH(d, top->tc_items.head)
+       RB_DLINK_FOREACH(d, top->tc_items.head)
        {
                cf = d->data;
                if(strcasecmp(cf->cf_name, name) == 0)
@@ -144,16 +141,16 @@ int
 remove_top_conf(char *name)
 {
        struct TopConf *tc;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
        if((tc = find_top_conf(name)) == NULL)
                return -1;
 
-       if((ptr = dlinkFind(tc, &conf_items)) == NULL)
+       if((ptr = rb_dlinkFind(tc, &conf_items)) == NULL)
                return -1;
 
-       dlinkDestroy(ptr, &conf_items);
-       MyFree(tc);
+       rb_dlinkDestroy(ptr, &conf_items);
+       rb_free(tc);
 
        return 0;
 }
@@ -194,7 +191,7 @@ conf_set_serverinfo_name(void *data)
 
                /* the ircd will exit() in main() if we dont set one */
                if(strlen(s) <= HOSTLEN)
-                       DupString(ServerInfo.name, (char *) data);
+                       ServerInfo.name = rb_strdup((char *) data);
        }
 }
 
@@ -225,8 +222,8 @@ conf_set_serverinfo_network_name(void *data)
        if((p = strchr((char *) data, ' ')))
                *p = '\0';
 
-       MyFree(ServerInfo.network_name);
-       DupString(ServerInfo.network_name, (char *) data);
+       rb_free(ServerInfo.network_name);
+       ServerInfo.network_name = rb_strdup((char *) data);
 }
 
 static void
@@ -271,7 +268,7 @@ conf_set_modules_module(void *data)
 
        load_one_module((char *) data, 0);
 
-       MyFree(m_bn);
+       rb_free(m_bn);
 #else
        conf_report_error("Ignoring modules::module -- loadable module support not present.");
 #endif
@@ -307,7 +304,7 @@ static struct mode_table umode_table[] = {
        {NULL, 0}
 };
 
-static struct mode_table flag_table[] = {
+static struct mode_table oper_table[] = {
        {"encrypted",           OPER_ENCRYPTED          },
        {"local_kill",          OPER_LOCKILL            },
        {"global_kill",         OPER_GLOBKILL|OPER_LOCKILL      },
@@ -451,8 +448,8 @@ set_modes_from_table(int *modes, const char *whatis, struct mode_table *tab, con
 static int
 conf_begin_oper(struct TopConf *tc)
 {
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
 
        if(yy_oper != NULL)
        {
@@ -460,10 +457,10 @@ conf_begin_oper(struct TopConf *tc)
                yy_oper = NULL;
        }
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, yy_oper_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_oper_list.head)
        {
                free_oper_conf(ptr->data);
-               dlinkDestroy(ptr, &yy_oper_list);
+               rb_dlinkDestroy(ptr, &yy_oper_list);
        }
 
        yy_oper = make_oper_conf();
@@ -476,15 +473,15 @@ static int
 conf_end_oper(struct TopConf *tc)
 {
        struct oper_conf *yy_tmpoper;
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
 
        if(conf_cur_block_name != NULL)
        {
                if(strlen(conf_cur_block_name) > OPERNICKLEN)
                        conf_cur_block_name[OPERNICKLEN] = '\0';
 
-               DupString(yy_oper->name, conf_cur_block_name);
+               yy_oper->name = rb_strdup(conf_cur_block_name);
        }
 
        if(EmptyString(yy_oper->name))
@@ -508,15 +505,15 @@ conf_end_oper(struct TopConf *tc)
         * and host in, yy_oper contains the rest of the information which
         * we need to copy into each element in yy_oper_list
         */
-       DLINK_FOREACH_SAFE(ptr, next_ptr, yy_oper_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_oper_list.head)
        {
                yy_tmpoper = ptr->data;
 
-               DupString(yy_tmpoper->name, yy_oper->name);
+               yy_tmpoper->name = rb_strdup(yy_oper->name);
 
                /* could be an rsa key instead.. */
                if(!EmptyString(yy_oper->passwd))
-                       DupString(yy_tmpoper->passwd, yy_oper->passwd);
+                       yy_tmpoper->passwd = rb_strdup(yy_oper->passwd);
 
                yy_tmpoper->flags = yy_oper->flags;
                yy_tmpoper->umodes = yy_oper->umodes;
@@ -552,7 +549,7 @@ conf_end_oper(struct TopConf *tc)
 #endif
 
                /* all is ok, put it on oper_conf_list */
-               dlinkMoveNode(ptr, &yy_oper_list, &oper_conf_list);
+               rb_dlinkMoveNode(ptr, &yy_oper_list, &oper_conf_list);
        }
 
        free_oper_conf(yy_oper);
@@ -566,7 +563,7 @@ conf_set_oper_flags(void *data)
 {
        conf_parm_t *args = data;
 
-       set_modes_from_table(&yy_oper->flags, "flag", flag_table, args);
+       set_modes_from_table(&yy_oper->flags, "flag", oper_table, args);
 }
 
 static void
@@ -582,14 +579,14 @@ conf_set_oper_user(void *data)
        {
                *p++ = '\0';
 
-               DupString(yy_tmpoper->username, host);
-               DupString(yy_tmpoper->host, p);
+               yy_tmpoper->username = rb_strdup(host);
+               yy_tmpoper->host = rb_strdup(p);
        }
        else
        {
 
-               DupString(yy_tmpoper->username, "*");
-               DupString(yy_tmpoper->host, host);
+               yy_tmpoper->username = rb_strdup("*");
+               yy_tmpoper->host = rb_strdup(host);
        }
 
        if(EmptyString(yy_tmpoper->username) || EmptyString(yy_tmpoper->host))
@@ -599,7 +596,7 @@ conf_set_oper_user(void *data)
                return;
        }
 
-       dlinkAddAlloc(yy_tmpoper, &yy_oper_list);
+       rb_dlinkAddAlloc(yy_tmpoper, &yy_oper_list);
 }
 
 static void
@@ -608,18 +605,18 @@ conf_set_oper_password(void *data)
        if(yy_oper->passwd)
        {
                memset(yy_oper->passwd, 0, strlen(yy_oper->passwd));
-               MyFree(yy_oper->passwd);
+               rb_free(yy_oper->passwd);
        }
 
-       DupString(yy_oper->passwd, (char *) data);
+       yy_oper->passwd = rb_strdup((char *) data);
 }
 
 static void
 conf_set_oper_rsa_public_key_file(void *data)
 {
 #ifdef HAVE_LIBCRYPTO
-       MyFree(yy_oper->rsa_pubkey_file);
-       DupString(yy_oper->rsa_pubkey_file, (char *) data);
+       rb_free(yy_oper->rsa_pubkey_file);
+       yy_oper->rsa_pubkey_file = rb_strdup((char *) data);
 #else
        conf_report_error("Warning -- ignoring rsa_public_key_file (OpenSSL support not available");
 #endif
@@ -651,7 +648,7 @@ static int
 conf_end_class(struct TopConf *tc)
 {
        if(conf_cur_block_name != NULL)
-               DupString(yy_class->class_name, conf_cur_block_name);
+               yy_class->class_name = rb_strdup(conf_cur_block_name);
 
        if(EmptyString(yy_class->class_name))
        {
@@ -734,7 +731,7 @@ static char *listener_address;
 static int
 conf_begin_listen(struct TopConf *tc)
 {
-       MyFree(listener_address);
+       rb_free(listener_address);
        listener_address = NULL;
        return 0;
 }
@@ -742,7 +739,7 @@ conf_begin_listen(struct TopConf *tc)
 static int
 conf_end_listen(struct TopConf *tc)
 {
-       MyFree(listener_address);
+       rb_free(listener_address);
        listener_address = NULL;
        return 0;
 }
@@ -786,23 +783,23 @@ conf_set_listen_port(void *data)
 static void
 conf_set_listen_address(void *data)
 {
-       MyFree(listener_address);
-       DupString(listener_address, data);
+       rb_free(listener_address);
+       listener_address = rb_strdup(data);
 }
 
 static int
 conf_begin_auth(struct TopConf *tc)
 {
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
 
        if(yy_aconf)
                free_conf(yy_aconf);
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
        {
                free_conf(ptr->data);
-               dlinkDestroy(ptr, &yy_aconf_list);
+               rb_dlinkDestroy(ptr, &yy_aconf_list);
        }
 
        yy_aconf = make_conf();
@@ -815,11 +812,11 @@ static int
 conf_end_auth(struct TopConf *tc)
 {
        struct ConfItem *yy_tmp;
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
 
        if(EmptyString(yy_aconf->name))
-               DupString(yy_aconf->name, "NOMATCH");
+               yy_aconf->name = rb_strdup("NOMATCH");
 
        /* didnt even get one ->host? */
        if(EmptyString(yy_aconf->host))
@@ -834,18 +831,18 @@ conf_end_auth(struct TopConf *tc)
        conf_add_class_to_conf(yy_aconf);
        add_conf_by_address(yy_aconf->host, CONF_CLIENT, yy_aconf->user, yy_aconf);
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
        {
                yy_tmp = ptr->data;
 
                if(yy_aconf->passwd)
-                       DupString(yy_tmp->passwd, yy_aconf->passwd);
+                       yy_tmp->passwd = rb_strdup(yy_aconf->passwd);
 
                /* this will always exist.. */
-               DupString(yy_tmp->name, yy_aconf->name);
+               yy_tmp->name = rb_strdup(yy_aconf->name);
 
                if(yy_aconf->className)
-                       DupString(yy_tmp->className, yy_aconf->className);
+                       yy_tmp->className = rb_strdup(yy_aconf->className);
 
                yy_tmp->flags = yy_aconf->flags;
                yy_tmp->port = yy_aconf->port;
@@ -856,7 +853,7 @@ conf_end_auth(struct TopConf *tc)
                conf_add_class_to_conf(yy_tmp);
 
                add_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user, yy_tmp);
-               dlinkDestroy(ptr, &yy_aconf_list);
+               rb_dlinkDestroy(ptr, &yy_aconf_list);
        }
 
        yy_aconf = NULL;
@@ -882,17 +879,17 @@ conf_set_auth_user(void *data)
        {
                *p++ = '\0';
 
-               DupString(yy_tmp->user, data);
-               DupString(yy_tmp->host, p);
+               yy_tmp->user = rb_strdup(data);
+               yy_tmp->host = rb_strdup(p);
        }
        else
        {
-               DupString(yy_tmp->user, "*");
-               DupString(yy_tmp->host, data);
+               yy_tmp->user = rb_strdup("*");
+               yy_tmp->host = rb_strdup(data);
        }
 
        if(yy_aconf != yy_tmp)
-               dlinkAddAlloc(yy_tmp, &yy_aconf_list);
+               rb_dlinkAddAlloc(yy_tmp, &yy_aconf_list);
 }
 
 static void
@@ -900,8 +897,8 @@ conf_set_auth_passwd(void *data)
 {
        if(yy_aconf->passwd)
                memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
-       MyFree(yy_aconf->passwd);
-       DupString(yy_aconf->passwd, data);
+       rb_free(yy_aconf->passwd);
+       yy_aconf->passwd = rb_strdup(data);
 }
 
 static void
@@ -960,8 +957,8 @@ conf_set_auth_spoof(void *data)
                return;
        }
 
-       MyFree(yy_aconf->name);
-       DupString(yy_aconf->name, data);
+       rb_free(yy_aconf->name);
+       yy_aconf->name = rb_strdup(data);
        yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
 }
 
@@ -977,8 +974,8 @@ static void
 conf_set_auth_redir_serv(void *data)
 {
        yy_aconf->flags |= CONF_FLAGS_REDIR;
-       MyFree(yy_aconf->name);
-       DupString(yy_aconf->name, data);
+       rb_free(yy_aconf->name);
+       yy_aconf->name = rb_strdup(data);
 }
 
 static void
@@ -993,8 +990,8 @@ conf_set_auth_redir_port(void *data)
 static void
 conf_set_auth_class(void *data)
 {
-       MyFree(yy_aconf->className);
-       DupString(yy_aconf->className, data);
+       rb_free(yy_aconf->className);
+       yy_aconf->className = rb_strdup(data);
 }
 
 /* ok, shared_oper handles the stacking, shared_flags handles adding
@@ -1004,12 +1001,12 @@ conf_set_auth_class(void *data)
 static int
 conf_cleanup_shared(struct TopConf *tc)
 {
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, yy_shared_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_shared_list.head)
        {
                free_remote_conf(ptr->data);
-               dlinkDestroy(ptr, &yy_shared_list);
+               rb_dlinkDestroy(ptr, &yy_shared_list);
        }
 
        if(yy_shared != NULL)
@@ -1041,11 +1038,11 @@ conf_set_shared_oper(void *data)
                        return;
                }
 
-               DupString(yy_shared->server, args->v.string);
+               yy_shared->server = rb_strdup(args->v.string);
                args = args->next;
        }
        else
-               DupString(yy_shared->server, "*");
+               yy_shared->server = rb_strdup("*");
 
        if((args->type & CF_MTYPE) != CF_QSTRING)
        {
@@ -1063,16 +1060,16 @@ conf_set_shared_oper(void *data)
        *p++ = '\0';
 
        if(EmptyString(p))
-               DupString(yy_shared->host, "*");
+               yy_shared->host = rb_strdup("*");
        else
-               DupString(yy_shared->host, p);
+               yy_shared->host = rb_strdup(p);
 
        if(EmptyString(username))
-               DupString(yy_shared->username, "*");
+               yy_shared->username = rb_strdup("*");
        else
-               DupString(yy_shared->username, username);
+               yy_shared->username = rb_strdup(username);
 
-       dlinkAddAlloc(yy_shared, &yy_shared_list);
+       rb_dlinkAddAlloc(yy_shared, &yy_shared_list);
        yy_shared = NULL;
 }
 
@@ -1081,20 +1078,20 @@ conf_set_shared_flags(void *data)
 {
        conf_parm_t *args = data;
        int flags = 0;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
        if(yy_shared != NULL)
                free_remote_conf(yy_shared);
 
        set_modes_from_table(&flags, "flag", shared_table, args);
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, yy_shared_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_shared_list.head)
        {
                yy_shared = ptr->data;
 
                yy_shared->flags = flags;
-               dlinkDestroy(ptr, &yy_shared_list);
-               dlinkAddTail(yy_shared, &yy_shared->node, &shared_conf_list);
+               rb_dlinkDestroy(ptr, &yy_shared_list);
+               rb_dlinkAddTail(yy_shared, &yy_shared->node, &shared_conf_list);
        }
 
        yy_shared = NULL;
@@ -1108,9 +1105,10 @@ conf_begin_connect(struct TopConf *tc)
 
        yy_server = make_server_conf();
        yy_server->port = PORTNUM;
+       yy_server->flags |= SERVER_TB;
 
        if(conf_cur_block_name != NULL)
-               DupString(yy_server->name, conf_cur_block_name);
+               yy_server->name = rb_strdup(conf_cur_block_name);
 
        return 0;
 }
@@ -1154,7 +1152,7 @@ conf_end_connect(struct TopConf *tc)
 #endif
 
        add_server_conf(yy_server);
-       dlinkAdd(yy_server, &yy_server->node, &server_conf_list);
+       rb_dlinkAdd(yy_server, &yy_server->node, &server_conf_list);
 
        yy_server = NULL;
        return 0;
@@ -1163,8 +1161,8 @@ conf_end_connect(struct TopConf *tc)
 static void
 conf_set_connect_host(void *data)
 {
-       MyFree(yy_server->host);
-       DupString(yy_server->host, data);
+       rb_free(yy_server->host);
+       yy_server->host = rb_strdup(data);
        if (strchr(yy_server->host, ':'))
                yy_server->aftype = AF_INET6;
 }
@@ -1188,10 +1186,10 @@ conf_set_connect_send_password(void *data)
        if(yy_server->spasswd)
        {
                memset(yy_server->spasswd, 0, strlen(yy_server->spasswd));
-               MyFree(yy_server->spasswd);
+               rb_free(yy_server->spasswd);
        }
 
-       DupString(yy_server->spasswd, data);
+       yy_server->spasswd = rb_strdup(data);
 }
 
 static void
@@ -1200,9 +1198,9 @@ conf_set_connect_accept_password(void *data)
        if(yy_server->passwd)
        {
                memset(yy_server->passwd, 0, strlen(yy_server->passwd));
-               MyFree(yy_server->passwd);
+               rb_free(yy_server->passwd);
        }
-       DupString(yy_server->passwd, data);
+       yy_server->passwd = rb_strdup(data);
 }
 
 static void
@@ -1253,9 +1251,9 @@ conf_set_connect_hub_mask(void *data)
        yy_hub = make_remote_conf();
        yy_hub->flags = CONF_HUB;
 
-       DupString(yy_hub->host, data);
-       DupString(yy_hub->server, yy_server->name);
-       dlinkAdd(yy_hub, &yy_hub->node, &hubleaf_conf_list);
+       yy_hub->host = rb_strdup(data);
+       yy_hub->server = rb_strdup(yy_server->name);
+       rb_dlinkAdd(yy_hub, &yy_hub->node, &hubleaf_conf_list);
 }
 
 static void
@@ -1269,16 +1267,16 @@ conf_set_connect_leaf_mask(void *data)
        yy_leaf = make_remote_conf();
        yy_leaf->flags = CONF_LEAF;
 
-       DupString(yy_leaf->host, data);
-       DupString(yy_leaf->server, yy_server->name);
-       dlinkAdd(yy_leaf, &yy_leaf->node, &hubleaf_conf_list);
+       yy_leaf->host = rb_strdup(data);
+       yy_leaf->server = rb_strdup(yy_server->name);
+       rb_dlinkAdd(yy_leaf, &yy_leaf->node, &hubleaf_conf_list);
 }
 
 static void
 conf_set_connect_class(void *data)
 {
-       MyFree(yy_server->class_name);
-       DupString(yy_server->class_name, data);
+       rb_free(yy_server->class_name);
+       yy_server->class_name = rb_strdup(data);
 }
 
 static void
@@ -1293,8 +1291,8 @@ conf_set_exempt_ip(void *data)
        }
 
        yy_tmp = make_conf();
-       DupString(yy_tmp->passwd, "*");
-       DupString(yy_tmp->host, data);
+       yy_tmp->passwd = rb_strdup("*");
+       yy_tmp->host = rb_strdup(data);
        yy_tmp->status = CONF_EXEMPTDLINE;
        add_conf_by_address(yy_tmp->host, CONF_EXEMPTDLINE, NULL, yy_tmp);
 }
@@ -1302,12 +1300,12 @@ conf_set_exempt_ip(void *data)
 static int
 conf_cleanup_cluster(struct TopConf *tc)
 {
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, yy_cluster_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_cluster_list.head)
        {
                free_remote_conf(ptr->data);
-               dlinkDestroy(ptr, &yy_cluster_list);
+               rb_dlinkDestroy(ptr, &yy_cluster_list);
        }
 
        if(yy_shared != NULL)
@@ -1326,8 +1324,8 @@ conf_set_cluster_name(void *data)
                free_remote_conf(yy_shared);
 
        yy_shared = make_remote_conf();
-       DupString(yy_shared->server, data);
-       dlinkAddAlloc(yy_shared, &yy_cluster_list);
+       yy_shared->server = rb_strdup(data);
+       rb_dlinkAddAlloc(yy_shared, &yy_cluster_list);
 
        yy_shared = NULL;
 }
@@ -1337,19 +1335,19 @@ conf_set_cluster_flags(void *data)
 {
        conf_parm_t *args = data;
        int flags = 0;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
        if(yy_shared != NULL)
                free_remote_conf(yy_shared);
 
        set_modes_from_table(&flags, "flag", cluster_table, args);
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, yy_cluster_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_cluster_list.head)
        {
                yy_shared = ptr->data;
                yy_shared->flags = flags;
-               dlinkAddTail(yy_shared, &yy_shared->node, &cluster_conf_list);
-               dlinkDestroy(ptr, &yy_cluster_list);
+               rb_dlinkAddTail(yy_shared, &yy_shared->node, &cluster_conf_list);
+               rb_dlinkDestroy(ptr, &yy_cluster_list);
        }
 
        yy_shared = NULL;
@@ -1536,9 +1534,9 @@ static int
 conf_begin_service(struct TopConf *tc)
 {
        struct Client *target_p;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
-       DLINK_FOREACH(ptr, global_serv_list.head)
+       RB_DLINK_FOREACH(ptr, global_serv_list.head)
        {
                target_p = ptr->data;
 
@@ -1574,8 +1572,8 @@ conf_set_service_name(void *data)
                return;
        }
 
-       DupString(tmp, data);
-       dlinkAddAlloc(tmp, &service_list);
+       tmp = rb_strdup(data);
+       rb_dlinkAddAlloc(tmp, &service_list);
 
        if((target_p = find_server(NULL, tmp)))
                target_p->flags |= FLAGS_SERVICE;
@@ -1584,10 +1582,10 @@ conf_set_service_name(void *data)
 static int
 conf_begin_alias(struct TopConf *tc)
 {
-       yy_alias = MyMalloc(sizeof(struct alias_entry));
+       yy_alias = rb_malloc(sizeof(struct alias_entry));
 
        if (conf_cur_block_name != NULL)
-               DupString(yy_alias->name, conf_cur_block_name);
+               yy_alias->name = rb_strdup(conf_cur_block_name);
 
        yy_alias->flags = 0;
        yy_alias->hits = 0;
@@ -1605,7 +1603,7 @@ conf_end_alias(struct TopConf *tc)
        {
                conf_report_error("Ignoring alias -- must have a name.");
 
-               MyFree(yy_alias);
+               rb_free(yy_alias);
 
                return -1;
        }
@@ -1614,7 +1612,7 @@ conf_end_alias(struct TopConf *tc)
        {
                conf_report_error("Ignoring alias -- must have a target.");
 
-               MyFree(yy_alias);
+               rb_free(yy_alias);
 
                return -1;
        }
@@ -1633,7 +1631,7 @@ conf_set_alias_name(void *data)
        if (data == NULL || yy_alias == NULL)   /* this shouldn't ever happen */
                return;
 
-       DupString(yy_alias->name, data);
+       yy_alias->name = rb_strdup(data);
 }
 
 static void
@@ -1642,25 +1640,25 @@ conf_set_alias_target(void *data)
        if (data == NULL || yy_alias == NULL)   /* this shouldn't ever happen */
                return;
 
-       DupString(yy_alias->target, data);
+       yy_alias->target = rb_strdup(data);
 }
 
 static void
 conf_set_blacklist_host(void *data)
 {
-       DupString(yy_blacklist_host, data);
+       yy_blacklist_host = rb_strdup(data);
 }
 
 static void
 conf_set_blacklist_reason(void *data)
 {
-       DupString(yy_blacklist_reason, data);
+       yy_blacklist_reason = rb_strdup(data);
 
        if (yy_blacklist_host && yy_blacklist_reason)
        {
                new_blacklist(yy_blacklist_host, yy_blacklist_reason);
-               MyFree(yy_blacklist_host);
-               MyFree(yy_blacklist_reason);
+               rb_free(yy_blacklist_host);
+               rb_free(yy_blacklist_reason);
                yy_blacklist_host = NULL;
                yy_blacklist_reason = NULL;
        }
@@ -1676,7 +1674,7 @@ conf_report_error(const char *fmt, ...)
        char msg[IRCD_BUFSIZE + 1] = { 0 };
 
        va_start(ap, fmt);
-       ircvsnprintf(msg, IRCD_BUFSIZE, fmt, ap);
+       rb_vsnprintf(msg, IRCD_BUFSIZE, fmt, ap);
        va_end(ap);
 
        if (testing_conf)
@@ -1699,7 +1697,7 @@ conf_start_block(char *block, char *name)
        }
 
        if(name)
-               DupString(conf_cur_block_name, name);
+               conf_cur_block_name = rb_strdup(name);
        else
                conf_cur_block_name = NULL;
 
@@ -1716,7 +1714,7 @@ conf_end_block(struct TopConf *tc)
        if(tc->tc_efunc)
                return tc->tc_efunc(tc);
 
-       MyFree(conf_cur_block_name);
+       rb_free(conf_cur_block_name);
        return 0;
 }
 
@@ -1735,8 +1733,8 @@ conf_set_generic_string(void *data, int len, void *location)
        if(len && strlen(input) > len)
                input[len] = '\0';
 
-       MyFree(*loc);
-       DupString(*loc, input);
+       rb_free(*loc);
+       *loc = rb_strdup(input);
 }
 
 int
@@ -1778,9 +1776,9 @@ conf_call_set(struct TopConf *tc, char *item, conf_parm_t * value, int type)
                        value->v.list->type = CF_STRING;
 
                        if(cp->v.number == 1)
-                               DupString(cp->v.string, "yes");
+                               cp->v.string = rb_strdup("yes");
                        else
-                               DupString(cp->v.string, "no");
+                               cp->v.string = rb_strdup("no");
                }
 
                /* maybe it's a CF_TIME and they passed CF_INT --
@@ -1848,14 +1846,14 @@ add_conf_item(const char *topconf, const char *name, int type, void (*func) (voi
        if((cf = find_conf_item(tc, name)) != NULL)
                return -1;
 
-       cf = MyMalloc(sizeof(struct ConfEntry));
+       cf = rb_malloc(sizeof(struct ConfEntry));
 
        cf->cf_name = name;
        cf->cf_type = type;
        cf->cf_func = func;
        cf->cf_arg = NULL;
 
-       dlinkAddAlloc(cf, &tc->tc_items);
+       rb_dlinkAddAlloc(cf, &tc->tc_items);
 
        return 0;
 }
@@ -1865,7 +1863,7 @@ remove_conf_item(const char *topconf, const char *name)
 {
        struct TopConf *tc;
        struct ConfEntry *cf;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
        if((tc = find_top_conf(topconf)) == NULL)
                return -1;
@@ -1873,11 +1871,11 @@ remove_conf_item(const char *topconf, const char *name)
        if((cf = find_conf_item(tc, name)) == NULL)
                return -1;
 
-       if((ptr = dlinkFind(cf, &tc->tc_items)) == NULL)
+       if((ptr = rb_dlinkFind(cf, &tc->tc_items)) == NULL)
                return -1;
 
-       dlinkDestroy(ptr, &tc->tc_items);
-       MyFree(cf);
+       rb_dlinkDestroy(ptr, &tc->tc_items);
+       rb_free(cf);
 
        return 0;
 }
@@ -2019,7 +2017,6 @@ static struct ConfEntry conf_general_table[] =
        { "gline_min_cidr6",    CF_INT,   NULL, 0, &ConfigFileEntry.gline_min_cidr6     },
        { "gline_time",         CF_TIME,  NULL, 0, &ConfigFileEntry.gline_time          },
        { "global_snotices",    CF_YESNO, NULL, 0, &ConfigFileEntry.global_snotices     },
-       { "idletime",           CF_TIME,  NULL, 0, &ConfigFileEntry.idletime            },
        { "hide_spoof_ips",     CF_YESNO, NULL, 0, &ConfigFileEntry.hide_spoof_ips      },
        { "dline_with_reason",  CF_YESNO, NULL, 0, &ConfigFileEntry.dline_with_reason   },
        { "kline_with_reason",  CF_YESNO, NULL, 0, &ConfigFileEntry.kline_with_reason   },