ircd startup: avoid black magic with file descriptors

[solanum.git] / ircd / channel.c

diff --git a/ircd/channel.c b/ircd/channel.c
index 4609325ab3266a60dd4c905e101608a00b281359..8f0b094e43e72134bb0e7ff5ed6d5eb243f02425 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -38,7 +38,6 @@
 #include "s_conf.h"            /* ConfigFileEntry, ConfigChannel */
 #include "s_newconf.h"
 #include "logger.h"
-#include "ipv4_from_ipv6.h"
 #include "s_assert.h"
 
 struct config_channel_entry ConfigChannel;
@@ -581,7 +580,7 @@ is_banned_list(struct Channel *chptr, rb_dlink_list *list,
        }
 #ifdef RB_IPV6
        if(GET_SS_FAMILY(&who->localClient->ip) == AF_INET6 &&
-                       ipv4_from_ipv6((const struct sockaddr_in6 *)&who->localClient->ip, &ip4))
+                       rb_ipv4_from_ipv6((const struct sockaddr_in6 *)&who->localClient->ip, &ip4))
        {
                sprintf(src_ip4host, "%s!%s@", who->name, who->username);
                s4 = src_ip4host + strlen(src_ip4host);
@@ -1260,7 +1259,7 @@ send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
        char *pbuf;
        const char *arg;
        int dir;
-       int arglen;
+       int arglen = 0;
 
        /* Now send to servers... */
        mc = 0;