Branch merge.

[irc/rqf/shadowircd.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index c043b5a386f35468a9252ad505777f099d8fcd69..e2032dadd0f0d5c3fc2a9c4c34808c4377a4ceaa 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -13,7 +13,7 @@
 #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"
@@ -241,7 +241,7 @@ conf_set_serverinfo_vhost(void *data)
 static void
 conf_set_serverinfo_vhost6(void *data)
 {
-#ifdef IPV6
+#ifdef RB_IPV6
        if(inetpton(AF_INET6, (char *) data, &ServerInfo.ip6.sin6_addr) <= 0)
        {
                conf_report_error("Invalid netmask for server IPv6 vhost (%s)", (char *) data);
@@ -670,7 +670,7 @@ conf_set_class_ping_time(void *data)
 static void
 conf_set_class_cidr_bitlen(void *data)
 {
-#ifdef IPV6
+#ifdef RB_IPV6
        unsigned int maxsize = 128;
 #else
        unsigned int maxsize = 32;
@@ -758,23 +758,22 @@ conf_set_listen_port(void *data)
                }
                 if(listener_address == NULL)
                 {
-                       /* XXX put ssl here -- dwr */
-                       add_listener(args->v.number, listener_address, AF_INET, 0);
-#ifdef IPV6
-                       add_listener(args->v.number, listener_address, AF_INET6, 0);
+                       add_listener(args->v.number, listener_address, AF_INET);
+#ifdef RB_IPV6
+                       add_listener(args->v.number, listener_address, AF_INET6);
 #endif
                 }
                else
                 {
                        int family;
-#ifdef IPV6
+#ifdef RB_IPV6
                        if(strchr(listener_address, ':') != NULL)
                                family = AF_INET6;
                        else 
 #endif
                                family = AF_INET;
                
-                       add_listener(args->v.number, listener_address, family, 0);
+                       add_listener(args->v.number, listener_address, family);
                 
                 }
 
@@ -1222,7 +1221,7 @@ conf_set_connect_aftype(void *data)
 
        if(strcasecmp(aft, "ipv4") == 0)
                yy_server->aftype = AF_INET;
-#ifdef IPV6
+#ifdef RB_IPV6
        else if(strcasecmp(aft, "ipv6") == 0)
                yy_server->aftype = AF_INET6;
 #endif
@@ -1894,7 +1893,7 @@ static struct ConfEntry conf_serverinfo_table[] =
        { "vhost",              CF_QSTRING, conf_set_serverinfo_vhost,  0, NULL },
        { "vhost6",             CF_QSTRING, conf_set_serverinfo_vhost6, 0, NULL },
 
-       { "max_clients",        CF_INT,     NULL, 0, &ServerInfo.max_clients    },
+       { "default_max_clients",CF_INT,     NULL, 0, &ServerInfo.default_max_clients },
 
        { "\0", 0, NULL, 0, NULL }
 };