X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/d5a432fa0092f39dbb517b5665f35dc87e5a88f7..1728a2acd0cc89dddb27ea92c4ff304e2f6b7a09:/src/newconf.c?ds=sidebyside

diff --git a/src/newconf.c b/src/newconf.c
index ae387a2..47f9569 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -11,7 +11,6 @@
 
 #include "newconf.h"
 #include "ircd_defs.h"
-#include "sprintf_irc.h"
 #include "common.h"
 #include "logger.h"
 #include "s_conf.h"
@@ -230,7 +229,7 @@ conf_set_serverinfo_network_name(void *data)
 static void
 conf_set_serverinfo_vhost(void *data)
 {
-	if(inetpton(AF_INET, (char *) data, &ServerInfo.ip.sin_addr) <= 0)
+	if(rb_inet_pton(AF_INET, (char *) data, &ServerInfo.ip.sin_addr) <= 0)
 	{
 		conf_report_error("Invalid netmask for server IPv4 vhost (%s)", (char *) data);
 		return;
@@ -243,7 +242,7 @@ static void
 conf_set_serverinfo_vhost6(void *data)
 {
 #ifdef RB_IPV6
-	if(inetpton(AF_INET6, (char *) data, &ServerInfo.ip6.sin6_addr) <= 0)
+	if(rb_inet_pton(AF_INET6, (char *) data, &ServerInfo.ip6.sin6_addr) <= 0)
 	{
 		conf_report_error("Invalid netmask for server IPv6 vhost (%s)", (char *) data);
 		return;
@@ -374,6 +373,10 @@ static struct mode_table shared_table[] =
 	{ "kline",	SHARED_PKLINE|SHARED_TKLINE	},
 	{ "xline",	SHARED_PXLINE|SHARED_TXLINE	},
 	{ "resv",	SHARED_PRESV|SHARED_TRESV	},
+	{ "dline",  SHARED_PDLINE|SHARED_TDLINE },
+	{ "tdline", SHARED_TDLINE	},
+	{ "pdline", SHARED_PDLINE   },
+	{ "undline",    SHARED_UNDLINE  },
 	{ "tkline",	SHARED_TKLINE	},
 	{ "unkline",	SHARED_UNKLINE	},
 	{ "txline",	SHARED_TXLINE	},
@@ -782,16 +785,16 @@ conf_set_listen_port_both(void *data, int ssl)
 	}
 }
 
-static void
-conf_set_listen_port(void *data)
-{
-	conf_set_listen_port_both(data, 0);
-}
-
-static void
-conf_set_listen_sslport(void *data)
-{
-	conf_set_listen_port_both(data, 1);
+static void
+conf_set_listen_port(void *data)
+{
+	conf_set_listen_port_both(data, 0);
+}
+
+static void
+conf_set_listen_sslport(void *data)
+{
+	conf_set_listen_port_both(data, 1);
 }
 
 static void
@@ -1164,12 +1167,12 @@ conf_end_connect(struct TopConf *tc)
 		yy_server->flags &= ~SERVER_COMPRESSED;
 	}
 #endif
-	if(ServerConfCompressed(yy_server) && ServerConfSSL(yy_server))
-	{
-		conf_report_error("Ignoring compressed for connect block %s -- "
-				       "ssl and compressed are mutually exclusive (OpenSSL does its own compression)", 
-				       yy_server->name);
-		yy_server->flags &= ~SERVER_COMPRESSED;
+	if(ServerConfCompressed(yy_server) && ServerConfSSL(yy_server))
+	{
+		conf_report_error("Ignoring compressed for connect block %s -- "
+				       "ssl and compressed are mutually exclusive (OpenSSL does its own compression)", 
+				       yy_server->name);
+		yy_server->flags &= ~SERVER_COMPRESSED;
 	}
 
 	add_server_conf(yy_server);
@@ -1191,7 +1194,7 @@ conf_set_connect_host(void *data)
 static void
 conf_set_connect_vhost(void *data)
 {
-	if(inetpton_sock(data, (struct sockaddr *)&yy_server->my_ipnum) <= 0)
+	if(rb_inet_pton_sock(data, (struct sockaddr *)&yy_server->my_ipnum) <= 0)
 	{
 		conf_report_error("Invalid netmask for server vhost (%s)",
 		    		  (char *) data);
@@ -1751,7 +1754,7 @@ conf_set_generic_string(void *data, int len, void *location)
 	char **loc = location;
 	char *input = data;
 
-	if(len && strlen(input) > len)
+	if(len && strlen(input) > (unsigned int)len)
 		input[len] = '\0';
 
 	rb_free(*loc);
@@ -1914,10 +1917,10 @@ static struct ConfEntry conf_serverinfo_table[] =
 	{ "vhost", 		CF_QSTRING, conf_set_serverinfo_vhost,	0, NULL },
 	{ "vhost6", 		CF_QSTRING, conf_set_serverinfo_vhost6,	0, NULL },
 
-	{ "ssl_private_key",    CF_QSTRING, NULL, 0, &ServerInfo.ssl_private_key },
-	{ "ssl_ca_cert",        CF_QSTRING, NULL, 0, &ServerInfo.ssl_ca_cert },
-	{ "ssl_cert",           CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert },   
-	{ "ssl_dh_params",      CF_QSTRING, NULL, 0, &ServerInfo.ssl_dh_params },
+	{ "ssl_private_key",    CF_QSTRING, NULL, 0, &ServerInfo.ssl_private_key },
+	{ "ssl_ca_cert",        CF_QSTRING, NULL, 0, &ServerInfo.ssl_ca_cert },
+	{ "ssl_cert",           CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert },   
+	{ "ssl_dh_params",      CF_QSTRING, NULL, 0, &ServerInfo.ssl_dh_params },
 	{ "ssld_count",		CF_INT,	    NULL, 0, &ServerInfo.ssld_count },
 
 	{ "default_max_clients",CF_INT,     NULL, 0, &ServerInfo.default_max_clients },