Replace most checks for +o with oper:general

[solanum.git] / ircd / s_newconf.c

diff --git a/ircd/s_newconf.c b/ircd/s_newconf.c
index a9c6617998223558ab17f8bb7f237836f88a4c85..cb11892620d5fdf1f6ac1b0a4688a98a14372b53 100644 (file)
--- a/ircd/s_newconf.c
+++ b/ircd/s_newconf.c
@@ -331,17 +331,15 @@ make_server_conf(void)
        SET_SS_FAMILY(&server_p->bind4, AF_UNSPEC);
        SET_SS_LEN(&server_p->bind4, sizeof(struct sockaddr_in));
 
-#ifdef RB_IPV6
        SET_SS_FAMILY(&server_p->connect6, AF_UNSPEC);
        SET_SS_LEN(&server_p->connect6, sizeof(struct sockaddr_in6));
 
        SET_SS_FAMILY(&server_p->bind6, AF_UNSPEC);
        SET_SS_LEN(&server_p->bind6, sizeof(struct sockaddr_in6));
-#endif
 
        server_p->aftype = AF_UNSPEC;
 
-       return rb_malloc(sizeof(struct server_conf));
+       return server_p;
 }
 
 void
@@ -367,6 +365,7 @@ free_server_conf(struct server_conf *server_p)
        rb_free(server_p->connect_host);
        rb_free(server_p->bind_host);
        rb_free(server_p->class_name);
+       rb_free(server_p->certfp);
        rb_free(server_p);
 }
 
@@ -388,19 +387,17 @@ conf_connect_dns_callback(const char *result, int status, int aftype, void *data
        if(aftype == AF_INET)
        {
                if(status == 1)
-                       rb_inet_pton_sock(result, (struct sockaddr *)&server_p->connect4);
+                       rb_inet_pton_sock(result, &server_p->connect4);
 
                server_p->dns_query_connect4 = 0;
        }
-#ifdef RB_IPV6
        else if(aftype == AF_INET6)
        {
                if(status == 1)
-                       rb_inet_pton_sock(result, (struct sockaddr *)&server_p->connect6);
+                       rb_inet_pton_sock(result, &server_p->connect6);
 
                server_p->dns_query_connect6 = 0;
        }
-#endif
 }
 
 /*
@@ -421,19 +418,17 @@ conf_bind_dns_callback(const char *result, int status, int aftype, void *data)
        if(aftype == AF_INET)
        {
                if(status == 1)
-                       rb_inet_pton_sock(result, (struct sockaddr *)&server_p->bind4);
+                       rb_inet_pton_sock(result, &server_p->bind4);
 
                server_p->dns_query_bind4 = 0;
        }
-#ifdef RB_IPV6
        else if(aftype == AF_INET6)
        {
                if(status == 1)
-                       rb_inet_pton_sock(result, (struct sockaddr *)&server_p->bind6);
+                       rb_inet_pton_sock(result, &server_p->bind6);
 
                server_p->dns_query_bind6 = 0;
        }
-#endif
 }
 
 void
@@ -461,20 +456,16 @@ add_server_conf(struct server_conf *server_p)
        {
                server_p->dns_query_connect4 =
                        lookup_hostname(server_p->connect_host, AF_INET, conf_connect_dns_callback, server_p);
-#ifdef RB_IPV6
                server_p->dns_query_connect6 =
                        lookup_hostname(server_p->connect_host, AF_INET6, conf_connect_dns_callback, server_p);
-#endif
        }
 
        if(server_p->bind_host)
        {
                server_p->dns_query_bind4 =
                        lookup_hostname(server_p->bind_host, AF_INET, conf_bind_dns_callback, server_p);
-#ifdef RB_IPV6
                server_p->dns_query_bind6 =
                        lookup_hostname(server_p->bind_host, AF_INET6, conf_bind_dns_callback, server_p);
-#endif
        }
 }