X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/90187f2112c827d9b76f9bcc7c06e22810548237..4f2b6c0b38c14c1e93e599e3dc26e7e3554a934b:/src/s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index 15912c9..11f6f2a 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -26,7 +26,6 @@
 
 #include "stdinc.h"
 #include "ircd_defs.h"
-#include "tools.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
@@ -35,40 +34,34 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "hostmask.h"
 #include "modules.h"
 #include "numeric.h"
-#include "commio.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
-#include "s_gline.h"
-#include "memory.h"
-#include "balloc.h"
-#include "patricia.h"
 #include "reject.h"
 #include "cache.h"
 #include "blacklist.h"
+#include "sslproc.h"
 
 struct config_server_hide ConfigServerHide;
 
-extern int yyparse();		/* defined in y.tab.c */
+extern int yyparse(void);		/* defined in y.tab.c */
 extern char linebuf[];
 
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned int) 0xffffffff)
 #endif
 
-static BlockHeap *confitem_heap = NULL;
+static rb_bh *confitem_heap = NULL;
 
-dlink_list temp_klines[LAST_TEMP_TYPE];
-dlink_list temp_dlines[LAST_TEMP_TYPE];
-dlink_list service_list;
+rb_dlink_list temp_klines[LAST_TEMP_TYPE];
+rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
+rb_dlink_list service_list;
 
 /* internally defined functions */
 static void set_default_conf(void);
@@ -88,22 +81,22 @@ static int attach_iline(struct Client *, struct ConfItem *);
 void
 init_s_conf(void)
 {
-	confitem_heap = BlockHeapCreate(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE);
+	confitem_heap = rb_bh_create(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE, "confitem_heap");
 
-	eventAddIsh("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
-	eventAddIsh("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
+	rb_event_addish("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
+	rb_event_addish("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
 
-	eventAddIsh("expire_temp_klines_hour", reorganise_temp_kd,
+	rb_event_addish("expire_temp_klines_hour", reorganise_temp_kd,
 			&temp_klines[TEMP_HOUR], 3600);
-	eventAddIsh("expire_temp_dlines_hour", reorganise_temp_kd,
+	rb_event_addish("expire_temp_dlines_hour", reorganise_temp_kd,
 			&temp_dlines[TEMP_HOUR], 3600);
-	eventAddIsh("expire_temp_klines_day", reorganise_temp_kd,
+	rb_event_addish("expire_temp_klines_day", reorganise_temp_kd,
 			&temp_klines[TEMP_DAY], 86400);
-	eventAddIsh("expire_temp_dlines_day", reorganise_temp_kd,
+	rb_event_addish("expire_temp_dlines_day", reorganise_temp_kd,
 			&temp_dlines[TEMP_DAY], 86400);
-	eventAddIsh("expire_temp_klines_week", reorganise_temp_kd,
+	rb_event_addish("expire_temp_klines_week", reorganise_temp_kd,
 			&temp_klines[TEMP_WEEK], 604800);
-	eventAddIsh("expire_temp_dlines_week", reorganise_temp_kd,
+	rb_event_addish("expire_temp_dlines_week", reorganise_temp_kd,
 			&temp_dlines[TEMP_WEEK], 604800);
 }
 
@@ -119,7 +112,7 @@ make_conf()
 {
 	struct ConfItem *aconf;
 
-	aconf = BlockHeapAlloc(confitem_heap);
+	aconf = rb_bh_alloc(confitem_heap);
 	aconf->status = CONF_ILLEGAL;
 	return (aconf);
 }
@@ -144,14 +137,14 @@ free_conf(struct ConfItem *aconf)
 	if(aconf->spasswd)
 		memset(aconf->spasswd, 0, strlen(aconf->spasswd));
 
-	MyFree(aconf->passwd);
-	MyFree(aconf->spasswd);
-	MyFree(aconf->name);
-	MyFree(aconf->className);
-	MyFree(aconf->user);
-	MyFree(aconf->host);
+	rb_free(aconf->passwd);
+	rb_free(aconf->spasswd);
+	rb_free(aconf->name);
+	rb_free(aconf->className);
+	rb_free(aconf->user);
+	rb_free(aconf->host);
 
-	BlockHeapFree(confitem_heap, aconf);
+	rb_bh_free(confitem_heap, aconf);
 }
 
 /*
@@ -173,8 +166,6 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 {
 	int i;
 
-	ClearAccess(source_p);
-
 	if((i = verify_access(source_p, username)))
 	{
 		ilog(L_FUSER, "Access denied: %s[%s]", 
@@ -202,7 +193,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 			source_p->name, IsGotId(source_p) ? "" : "~",
 			source_p->username, source_p->sockhost);	
 
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		exit_client(client_p, source_p, &me, "Too many host connections (local)");
 		break;
 
@@ -216,7 +207,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 			source_p->name, IsGotId(source_p) ? "" : "~",
 			source_p->username, source_p->sockhost);
 
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		exit_client(client_p, source_p, &me, "Too many host connections (global)");
 		break;
 
@@ -230,7 +221,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 			source_p->name, IsGotId(source_p) ? "" : "~",
 			source_p->username, source_p->sockhost);
 
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		exit_client(client_p, source_p, &me, "Too many user connections (global)");
 		break;
 
@@ -245,7 +236,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 			source_p->name, IsGotId(source_p) ? "" : "~",
 			source_p->username, source_p->sockhost);
 
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		exit_client(client_p, source_p, &me,
 			    "No more connections allowed in your connection class");
 		break;
@@ -253,20 +244,20 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 	case NOT_AUTHORISED:
 		{
 			int port = -1;
-#ifdef IPV6
+#ifdef RB_IPV6
 			if(source_p->localClient->ip.ss_family == AF_INET6)
 				port = ntohs(((struct sockaddr_in6 *)&source_p->localClient->listener->addr)->sin6_port);
 			else
 #endif
 				port = ntohs(((struct sockaddr_in *)&source_p->localClient->listener->addr)->sin_port);
 			
-			ServerStats->is_ref++;
+			ServerStats.is_ref++;
 			/* jdc - lists server name & port connections are on */
 			/*       a purely cosmetical change */
 			/* why ipaddr, and not just source_p->sockhost? --fl */
 #if 0
 			static char ipaddr[HOSTIPLEN];
-			inetntop_sock(&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
+			rb_inet_ntop_sock(&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
 #endif
 			sendto_realops_snomask(SNO_UNAUTH, L_ALL,
 					"Unauthorised client connection from "
@@ -281,15 +272,14 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 				source_p->name, IsGotId(source_p) ? "" : "~",
 				source_p->username, source_p->sockhost,
 				source_p->localClient->listener->name, port);
-			add_reject(client_p);
+			add_reject(client_p, NULL, NULL);
 			exit_client(client_p, source_p, &me,
 				    "You are not authorised to use this server");
 			break;
 		}
 	case BANNED_CLIENT:
-		add_reject(client_p);
 		exit_client(client_p, client_p, &me, "*** Banned ");
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		break;
 
 	case 0:
@@ -318,16 +308,18 @@ verify_access(struct Client *client_p, const char *username)
 		aconf = find_address_conf(client_p->host, client_p->sockhost, 
 					client_p->username, client_p->username,
 					(struct sockaddr *) &client_p->localClient->ip,
-					client_p->localClient->ip.ss_family);
+					client_p->localClient->ip.ss_family,
+					client_p->localClient->auth_user);
 	}
 	else
 	{
-		strlcpy(non_ident, "~", sizeof(non_ident));
-		strlcat(non_ident, username, sizeof(non_ident));
+		rb_strlcpy(non_ident, "~", sizeof(non_ident));
+		rb_strlcat(non_ident, username, sizeof(non_ident));
 		aconf = find_address_conf(client_p->host, client_p->sockhost,
 					non_ident, client_p->username,
 					(struct sockaddr *) &client_p->localClient->ip,
-					client_p->localClient->ip.ss_family);
+					client_p->localClient->ip.ss_family,
+					client_p->localClient->auth_user);
 	}
 
 	if(aconf == NULL)
@@ -342,10 +334,6 @@ verify_access(struct Client *client_p, const char *username)
 			return (NOT_AUTHORISED);
 		}
 
-
-		if(IsConfDoIdentd(aconf))
-			SetNeedId(client_p);
-
 		/* Thanks for spoof idea amm */
 		if(IsConfDoSpoofIp(aconf))
 		{
@@ -369,14 +357,14 @@ verify_access(struct Client *client_p, const char *username)
 				char *host = p+1;
 				*p = '\0';
 
-				strlcpy(client_p->username, aconf->name,
+				rb_strlcpy(client_p->username, aconf->name,
 					sizeof(client_p->username));
-				strlcpy(client_p->host, host,
+				rb_strlcpy(client_p->host, host,
 					sizeof(client_p->host));
 				*p = '@';
 			}
 			else
-				strlcpy(client_p->host, aconf->name, sizeof(client_p->host));
+				rb_strlcpy(client_p->host, aconf->name, sizeof(client_p->host));
 		}
 		return (attach_iline(client_p, aconf));
 	}
@@ -388,17 +376,7 @@ verify_access(struct Client *client_p, const char *username)
 					form_str(ERR_YOUREBANNEDCREEP),
 					me.name, client_p->name, aconf->passwd);
 		}
-		return (BANNED_CLIENT);
-	}
-	else if(aconf->status & CONF_GLINE)
-	{
-		sendto_one_notice(client_p, ":*** G-lined");
-
-		if(ConfigFileEntry.kline_with_reason)
-			sendto_one(client_p,
-					form_str(ERR_YOUREBANNEDCREEP),
-					me.name, client_p->name, aconf->passwd);
-
+		add_reject(client_p, aconf->user, aconf->host);
 		return (BANNED_CLIENT);
 	}
 
@@ -418,13 +396,13 @@ verify_access(struct Client *client_p, const char *username)
 static int
 add_ip_limit(struct Client *client_p, struct ConfItem *aconf)
 {
-	patricia_node_t *pnode;
+	rb_patricia_node_t *pnode;
 
 	/* If the limits are 0 don't do anything.. */
 	if(ConfCidrAmount(aconf) == 0 || ConfCidrBitlen(aconf) == 0)
 		return -1;
 
-	pnode = match_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip);
+	pnode = rb_match_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip);
 
 	if(pnode == NULL)
 		pnode = make_and_lookup_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip, ConfCidrBitlen(aconf));
@@ -439,7 +417,7 @@ add_ip_limit(struct Client *client_p, struct ConfItem *aconf)
 			/* This should only happen if the limits are set to 0 */
 			if((unsigned long) pnode->data == 0)
 			{
-				patricia_remove(ConfIpLimits(aconf), pnode);
+				rb_patricia_remove(ConfIpLimits(aconf), pnode);
 			}
 			return (0);
 		}
@@ -452,20 +430,20 @@ add_ip_limit(struct Client *client_p, struct ConfItem *aconf)
 static void
 remove_ip_limit(struct Client *client_p, struct ConfItem *aconf)
 {
-	patricia_node_t *pnode;
+	rb_patricia_node_t *pnode;
 
 	/* If the limits are 0 don't do anything.. */
 	if(ConfCidrAmount(aconf) == 0 || ConfCidrBitlen(aconf) == 0)
 		return;
 
-	pnode = match_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip);
+	pnode = rb_match_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip);
 	if(pnode == NULL)
 		return;
 
 	pnode->data--;
 	if(((unsigned long) pnode->data) == 0)
 	{
-		patricia_remove(ConfIpLimits(aconf), pnode);
+		rb_patricia_remove(ConfIpLimits(aconf), pnode);
 	}
 
 }
@@ -482,7 +460,7 @@ static int
 attach_iline(struct Client *client_p, struct ConfItem *aconf)
 {
 	struct Client *target_p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	int local_count = 0;
 	int global_count = 0;
 	int ident_count = 0;
@@ -496,7 +474,7 @@ attach_iline(struct Client *client_p, struct ConfItem *aconf)
 
 
 	/* find_hostname() returns the head of the list to search */
-	DLINK_FOREACH(ptr, find_hostname(client_p->host))
+	RB_DLINK_FOREACH(ptr, find_hostname(client_p->host))
 	{
 		target_p = ptr->data;
 
@@ -604,7 +582,6 @@ attach_conf(struct Client *client_p, struct ConfItem *aconf)
 		else
 		{
 			sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
-			SetExemptLimits(client_p);
 		}
 
 	}
@@ -640,9 +617,9 @@ rehash(int sig)
 	read_conf_files(NO);
 
 	if(ServerInfo.description != NULL)
-		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
+		rb_strlcpy(me.info, ServerInfo.description, sizeof(me.info));
 	else
-		strlcpy(me.info, "unknown", sizeof(me.info));
+		rb_strlcpy(me.info, "unknown", sizeof(me.info));
 
 	open_logfiles();
 	return (0);
@@ -728,12 +705,12 @@ set_default_conf(void)
 	/* ServerInfo.name is not rehashable */
 	/* ServerInfo.name = ServerInfo.name; */
 	ServerInfo.description = NULL;
-	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
-	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
+	ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
+	ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
 
 	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
 	ServerInfo.specific_ipv4_vhost = 0;
-#ifdef IPV6
+#ifdef RB_IPV6
 	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
 	ServerInfo.specific_ipv6_vhost = 0;
 #endif
@@ -744,9 +721,9 @@ set_default_conf(void)
 	AdminInfo.email = NULL;
 	AdminInfo.description = NULL;
 
-	DupString(ConfigFileEntry.default_operstring, "is an IRC operator");
-	DupString(ConfigFileEntry.default_adminstring, "is a Server Administrator");
-	DupString(ConfigFileEntry.servicestring, "is a Network Service");
+	ConfigFileEntry.default_operstring = rb_strdup("is an IRC operator");
+	ConfigFileEntry.default_adminstring = rb_strdup("is a Server Administrator");
+	ConfigFileEntry.servicestring = rb_strdup("is a Network Service");
 
 	ConfigFileEntry.default_umodes = UMODE_INVISIBLE;	
 	ConfigFileEntry.failed_oper_notice = YES;
@@ -787,21 +764,14 @@ set_default_conf(void)
 	ConfigFileEntry.fname_operlog = NULL;
 	ConfigFileEntry.fname_foperlog = NULL;
 	ConfigFileEntry.fname_serverlog = NULL;
-	ConfigFileEntry.fname_glinelog = NULL;
 	ConfigFileEntry.fname_klinelog = NULL;
 	ConfigFileEntry.fname_operspylog = NULL;
 	ConfigFileEntry.fname_ioerrorlog = NULL;
-	ConfigFileEntry.glines = NO;
 	ConfigFileEntry.use_egd = NO;
-	ConfigFileEntry.gline_time = 12 * 3600;
-	ConfigFileEntry.gline_min_cidr = 16;
-	ConfigFileEntry.gline_min_cidr6 = 48;
 	ConfigFileEntry.hide_spoof_ips = YES;
 	ConfigFileEntry.hide_error_messages = 1;
-	ConfigFileEntry.idletime = 0;
 	ConfigFileEntry.dots_in_ident = 0;
 	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
-	DupString(ConfigFileEntry.servlink_path, SLPATH);
 	ConfigFileEntry.egdpool_path = NULL;
 	ConfigFileEntry.use_whois_actually = YES;
 	ConfigFileEntry.burst_away = NO;
@@ -849,9 +819,10 @@ set_default_conf(void)
         ConfigFileEntry.reject_after_count = 5;
 	ConfigFileEntry.reject_ban_time = 300;  
 	ConfigFileEntry.reject_duration = 120;
-	ConfigFileEntry.max_unknown_ip = 2;
+	ConfigFileEntry.throttle_count = 4;
+	ConfigFileEntry.throttle_duration = 60;
 
-	ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
+	ServerInfo.default_max_clients = MAXCONNECTIONS;
 }
 
 #undef YES
@@ -886,59 +857,46 @@ validate_conf(void)
 	if(ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
 		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
 
-	if(ConfigFileEntry.servlink_path == NULL)
-		DupString(ConfigFileEntry.servlink_path, SLPATH);
-
 	if(ServerInfo.network_name == NULL)
-		DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
+		ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
 
 	if(ServerInfo.network_desc == NULL)
-		DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
+		ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
+
+	if(ServerInfo.ssld_count < 1)
+		ServerInfo.ssld_count = 1;
+
+	if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params))
+	{
+		ilog(L_MAIN, "WARNING: Unable to setup SSL.");
+		ssl_ok = 0;
+	} else {
+		ssl_ok = 1;
+		send_new_ssl_certs(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);
+	}
+
+	if(ServerInfo.ssld_count > get_ssld_count())
+	{
+		int start = ServerInfo.ssld_count - get_ssld_count();
+		/* start up additional ssld if needed */
+		start_ssldaemon(start, ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);
+				
+	}
 
 	if((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
 	   (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
 		ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
 
-	GlobalSetOptions.idletime = (ConfigFileEntry.idletime * 60);
-
 	if(!split_users || !split_servers ||
 	   (!ConfigChannel.no_create_on_split && !ConfigChannel.no_join_on_split))
 	{
-		eventDelete(check_splitmode, NULL);
+		rb_event_delete(check_splitmode_ev);
+		check_splitmode_ev = NULL;
 		splitmode = 0;
 		splitchecking = 0;
 	}
 }
 
-/*
- * lookup_confhost - start DNS lookups of all hostnames in the conf
- * line and convert an IP addresses in a.b.c.d number for to IP#s.
- *
- */
-
-/*
- * conf_connect_allowed
- *
- * inputs	- pointer to inaddr
- *		- int type ipv4 or ipv6
- * output	- ban info or NULL
- * side effects	- none
- */
-struct ConfItem *
-conf_connect_allowed(struct sockaddr *addr, int aftype)
-{
-	struct ConfItem *aconf = find_dline(addr, aftype);
-
-	/* DLINE exempt also gets you out of static limits/pacing... */
-	if(aconf && (aconf->status & CONF_EXEMPTDLINE))
-		return NULL;
-
-	if(aconf != NULL)
-		return aconf;
-
-	return NULL;
-}
-
 /* add_temp_kline()
  *
  * inputs        - pointer to struct ConfItem
@@ -949,29 +907,29 @@ conf_connect_allowed(struct sockaddr *addr, int aftype)
 void
 add_temp_kline(struct ConfItem *aconf)
 {
-	if(aconf->hold >= CurrentTime + (10080 * 60))
+	if(aconf->hold >= rb_current_time() + (10080 * 60))
 	{
-		dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
+		rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
 		aconf->port = TEMP_WEEK;
 	}
-	else if(aconf->hold >= CurrentTime + (1440 * 60))
+	else if(aconf->hold >= rb_current_time() + (1440 * 60))
 	{
-		dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
+		rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
 		aconf->port = TEMP_DAY;
 	}
-	else if(aconf->hold >= CurrentTime + (60 * 60))
+	else if(aconf->hold >= rb_current_time() + (60 * 60))
 	{
-		dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
+		rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
 		aconf->port = TEMP_HOUR;
 	}
 	else
 	{
-		dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]);
+		rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]);
 		aconf->port = TEMP_MIN;
 	}
 
 	aconf->flags |= CONF_FLAGS_TEMPORARY;
-	add_conf_by_address(aconf->host, CONF_KILL, aconf->user, aconf);
+	add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
 }
 
 /* add_temp_dline()
@@ -983,29 +941,29 @@ add_temp_kline(struct ConfItem *aconf)
 void
 add_temp_dline(struct ConfItem *aconf)
 {
-	if(aconf->hold >= CurrentTime + (10080 * 60))
+	if(aconf->hold >= rb_current_time() + (10080 * 60))
 	{
-		dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
+		rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
 		aconf->port = TEMP_WEEK;
 	}
-	else if(aconf->hold >= CurrentTime + (1440 * 60))
+	else if(aconf->hold >= rb_current_time() + (1440 * 60))
 	{
-		dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
+		rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
 		aconf->port = TEMP_DAY;
 	}
-	else if(aconf->hold >= CurrentTime + (60 * 60))
+	else if(aconf->hold >= rb_current_time() + (60 * 60))
 	{
-		dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
+		rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
 		aconf->port = TEMP_HOUR;
 	}
 	else
 	{
-		dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]);
+		rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]);
 		aconf->port = TEMP_MIN;
 	}
 
 	aconf->flags |= CONF_FLAGS_TEMPORARY;
-	add_conf_by_address(aconf->host, CONF_DLINE, aconf->user, aconf);
+	add_conf_by_address(aconf->host, CONF_DLINE, aconf->user, NULL, aconf);
 }
 
 /* expire_tkline()
@@ -1018,15 +976,15 @@ add_temp_dline(struct ConfItem *aconf)
 static void
 expire_temp_kd(void *list)
 {
-	dlink_node *ptr;
-	dlink_node *next_ptr;
+	rb_dlink_node *ptr;
+	rb_dlink_node *next_ptr;
 	struct ConfItem *aconf;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
 	{
 		aconf = ptr->data;
 
-		if(aconf->hold <= CurrentTime)
+		if(aconf->hold <= rb_current_time())
 		{
 			/* Alert opers that a TKline expired - Hwy */
 			if(ConfigFileEntry.tkline_expire_notices)
@@ -1036,7 +994,7 @@ expire_temp_kd(void *list)
 						     user : "*", (aconf->host) ? aconf->host : "*");
 
 			delete_one_address_conf(aconf->host, aconf);
-			dlinkDestroy(ptr, list);
+			rb_dlinkDestroy(ptr, list);
 		}
 	}
 }
@@ -1045,30 +1003,30 @@ static void
 reorganise_temp_kd(void *list)
 {
 	struct ConfItem *aconf;
-	dlink_node *ptr, *next_ptr;
+	rb_dlink_node *ptr, *next_ptr;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
 	{
 		aconf = ptr->data;
 
-		if(aconf->hold < (CurrentTime + (60 * 60)))
+		if(aconf->hold < (rb_current_time() + (60 * 60)))
 		{
-			dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+			rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
 					&temp_klines[TEMP_MIN] : &temp_dlines[TEMP_MIN]);
 			aconf->port = TEMP_MIN;
 		}
 		else if(aconf->port > TEMP_HOUR)
 		{
-			if(aconf->hold < (CurrentTime + (1440 * 60)))
+			if(aconf->hold < (rb_current_time() + (1440 * 60)))
 			{
-				dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+				rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
 						&temp_klines[TEMP_HOUR] : &temp_dlines[TEMP_HOUR]);
 				aconf->port = TEMP_HOUR;
 			}
 			else if(aconf->port > TEMP_DAY && 
-				(aconf->hold < (CurrentTime + (10080 * 60))))
+				(aconf->hold < (rb_current_time() + (10080 * 60))))
 			{
-				dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+				rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
 						&temp_klines[TEMP_DAY] : &temp_dlines[TEMP_DAY]);
 				aconf->port = TEMP_DAY;
 			}
@@ -1091,13 +1049,13 @@ get_oper_name(struct Client *client_p)
 
 	if(MyOper(client_p))
 	{
-		ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+		rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
 				client_p->name, client_p->username,
 				client_p->host, client_p->localClient->opername);
 		return buffer;
 	}
 
-	ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+	rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
 		   client_p->name, client_p->username, 
 		   client_p->host, client_p->servptr->name);
 	return buffer;
@@ -1173,7 +1131,7 @@ read_conf_files(int cold)
 
 	   - Gozem 2002-07-21 
 	 */
-	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
+	rb_strlcpy(conffilebuf, filename, sizeof(conffilebuf));
 
 	if((conf_fbfile_in = fopen(filename, "r")) == NULL)
 	{
@@ -1207,9 +1165,9 @@ free_alias_cb(struct DictionaryElement *ptr, void *unused)
 {
 	struct alias_entry *aptr = ptr->data;
 
-	MyFree(aptr->name);
-	MyFree(aptr->target);
-	MyFree(aptr);
+	rb_free(aptr->name);
+	rb_free(aptr->target);
+	rb_free(aptr);
 }
 
 /*
@@ -1223,14 +1181,14 @@ static void
 clear_out_old_conf(void)
 {
 	struct Class *cltmp;
-	dlink_node *ptr;
-	dlink_node *next_ptr;
+	rb_dlink_node *ptr;
+	rb_dlink_node *next_ptr;
 
 	/*
 	 * don't delete the class table, rather mark all entries
 	 * for deletion. The table is cleaned up by check_class. - avalon
 	 */
-	DLINK_FOREACH(ptr, class_list.head)
+	RB_DLINK_FOREACH(ptr, class_list.head)
 	{
 		cltmp = ptr->data;
 		MaxUsers(cltmp) = -1;
@@ -1247,19 +1205,21 @@ clear_out_old_conf(void)
 #endif
 
 	/* clean out ServerInfo */
-	MyFree(ServerInfo.description);
+	rb_free(ServerInfo.description);
 	ServerInfo.description = NULL;
-	MyFree(ServerInfo.network_name);
+	rb_free(ServerInfo.network_name);
 	ServerInfo.network_name = NULL;
-	MyFree(ServerInfo.network_desc);
+	rb_free(ServerInfo.network_desc);
 	ServerInfo.network_desc = NULL;
 
+	ServerInfo.ssld_count = 1;
+
 	/* clean out AdminInfo */
-	MyFree(AdminInfo.name);
+	rb_free(AdminInfo.name);
 	AdminInfo.name = NULL;
-	MyFree(AdminInfo.email);
+	rb_free(AdminInfo.email);
 	AdminInfo.email = NULL;
-	MyFree(AdminInfo.description);
+	rb_free(AdminInfo.description);
 	AdminInfo.description = NULL;
 
 	/* operator{} and class{} blocks are freed above */
@@ -1271,13 +1231,13 @@ clear_out_old_conf(void)
 	 */
 
 	/* clean out general */
-	MyFree(ConfigFileEntry.servlink_path);
-	ConfigFileEntry.servlink_path = NULL;
+	rb_free(ConfigFileEntry.kline_reason);
+	ConfigFileEntry.kline_reason = NULL;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
 	{
-		MyFree(ptr->data);
-		dlinkDestroy(ptr, &service_list);
+		rb_free(ptr->data);
+		rb_dlinkDestroy(ptr, &service_list);
 	}
 
 	/* remove any aliases... -- nenolod */
@@ -1388,21 +1348,21 @@ write_confitem(KlineType type, struct Client *source_p, char *user,
 
 	if(type == KLINE_TYPE)
 	{
-		ircsnprintf(buffer, sizeof(buffer),
+		rb_snprintf(buffer, sizeof(buffer),
 			   "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
 			   user, host, reason, oper_reason, current_date,
-			   get_oper_name(source_p), CurrentTime);
+			   get_oper_name(source_p), (long int)rb_current_time());
 	}
 	else if(type == DLINE_TYPE)
 	{
-		ircsnprintf(buffer, sizeof(buffer),
+		rb_snprintf(buffer, sizeof(buffer),
 			   "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
-			   reason, oper_reason, current_date, get_oper_name(source_p), CurrentTime);
+			   reason, oper_reason, current_date, get_oper_name(source_p), (long int)rb_current_time());
 	}
 	else if(type == RESV_TYPE)
 	{
-		ircsnprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
-			   host, reason, get_oper_name(source_p), CurrentTime);
+		rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
+			   host, reason, get_oper_name(source_p), (long int)rb_current_time());
 	}
 
 	if(fputs(buffer, out) == -1)
@@ -1458,7 +1418,7 @@ conf_add_class_to_conf(struct ConfItem *aconf)
 {
 	if(aconf->className == NULL)
 	{
-		DupString(aconf->className, "default");
+		aconf->className = rb_strdup("default");
 		ClassPtr(aconf) = default_class;
 		return;
 	}
@@ -1474,16 +1434,16 @@ conf_add_class_to_conf(struct ConfItem *aconf)
 					     aconf->className, aconf->user, aconf->host);
 		}
 
-		MyFree(aconf->className);
-		DupString(aconf->className, "default");
+		rb_free(aconf->className);
+		aconf->className = rb_strdup("default");
 		return;
 	}
 
 	if(ConfMaxUsers(aconf) < 0)
 	{
 		ClassPtr(aconf) = default_class;
-		MyFree(aconf->className);
-		DupString(aconf->className, "default");
+		rb_free(aconf->className);
+		aconf->className = rb_strdup("default");
 		return;
 	}
 }
@@ -1513,10 +1473,28 @@ conf_add_d_conf(struct ConfItem *aconf)
 	}
 	else
 	{
-		add_conf_by_address(aconf->host, CONF_DLINE, NULL, aconf);
+		add_conf_by_address(aconf->host, CONF_DLINE, NULL, NULL, aconf);
 	}
 }
 
+static char *
+strip_tabs(char *dest, const char *src, size_t len)
+{
+	char *d = dest;
+
+	if(dest == NULL || src == NULL)
+		return NULL;
+
+	rb_strlcpy(dest, src, len);
+
+	while(*d)
+	{
+		if(*d == '\t')
+			*d = ' ';
+		d++;
+	}
+	return dest;
+}
 
 /*
  * yyerror
@@ -1530,7 +1508,7 @@ yyerror(const char *msg)
 {
 	char newlinebuf[BUFSIZE];
 
-	strip_tabs(newlinebuf, (const unsigned char *) linebuf, strlen(linebuf));
+	strip_tabs(newlinebuf, linebuf, strlen(linebuf));
 
 	sendto_realops_snomask(SNO_GENERAL, L_ALL, "\"%s\", line %d: %s at '%s'",
 			     conffilebuf, lineno + 1, msg, newlinebuf);