authproc: don't shadow variable decls, avoid reserved name

[solanum.git] / ircd / newconf.c

diff --git a/ircd/newconf.c b/ircd/newconf.c
index 4f1dd4afac5dc37a015aa39c5d4441352bc7295b..72e6060a0609f1e3f1d5332debe2f794f4605e50 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));
        }
 }
 
@@ -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;
 }