ircd startup: avoid black magic with file descriptors

[solanum.git] / ircd / newconf.c

diff --git a/ircd/newconf.c b/ircd/newconf.c
index 4f1dd4afac5dc37a015aa39c5d4441352bc7295b..0c89e25206348f6b45a4ab1fbc0f05d1e6fdd8cd 100644 (file)
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -225,7 +225,7 @@ conf_set_serverinfo_sid(void *data)
                        return;
                }
 
-               strcpy(ServerInfo.sid, sid);
+               rb_strlcpy(ServerInfo.sid, sid, sizeof(ServerInfo.sid));
        }
 }
 
@@ -300,7 +300,7 @@ conf_set_modules_module(void *data)
 
        m_bn = rb_basename((char *) data);
 
-       if(findmodule_byname(m_bn) == -1)
+       if(findmodule_byname(m_bn) == NULL)
                load_one_module((char *) data, MAPI_ORIGIN_EXTENSION, false);
 
        rb_free(m_bn);
@@ -842,6 +842,8 @@ conf_begin_listen(struct TopConf *tc)
 {
        rb_free(listener_address);
        listener_address = NULL;
+       yy_wsock = 0;
+       yy_defer_accept = 0;
        return 0;
 }
 
@@ -850,6 +852,8 @@ conf_end_listen(struct TopConf *tc)
 {
        rb_free(listener_address);
        listener_address = NULL;
+       yy_wsock = 0;
+       yy_defer_accept = 0;
        return 0;
 }