Merge pull request #341 from ophion-project/upstream/modularize-regonlymsg

[solanum.git] / ircd / ircd.c

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 6c92a5b709c6ffdc90255f435d64db45e5061efe..64292609d21b51137837dfaf034dc1934f2f822e 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -679,6 +679,7 @@ charybdis_main(int argc, char * const argv[])
        me.localClient = &meLocalUser;
 
        /* Make sure all lists are zeroed */
+       memset(&global_client_list, 0, sizeof(global_client_list));
        memset(&unknown_list, 0, sizeof(unknown_list));
        memset(&lclient_list, 0, sizeof(lclient_list));
        memset(&serv_list, 0, sizeof(serv_list));
@@ -725,13 +726,13 @@ charybdis_main(int argc, char * const argv[])
        {
                check_pidfile(pidFileName);
 
+               inotice("starting %s ...", ircd_version);
+               inotice("%s", rb_lib_version());
+
 #ifndef _WIN32
                if(!server_state_foreground)
                        make_daemon();
 #endif
-
-               inotice("starting %s ...", ircd_version);
-               inotice("%s", rb_lib_version());
        }
 
        /* Init the event subsystem */
@@ -823,13 +824,6 @@ charybdis_main(int argc, char * const argv[])
                        ircd_ssl_ok = true;
        }
 
-       if (testing_conf)
-       {
-               fprintf(stderr, "\nConfig testing complete.\n");
-               fflush(stderr);
-               return 0;       /* Why? We want the launcher to exit out. */
-       }
-
        me.from = &me;
        me.servptr = &me;
        SetMe(&me);
@@ -843,6 +837,13 @@ charybdis_main(int argc, char * const argv[])
 
        construct_umodebuf();
 
+       if (testing_conf)
+       {
+               fprintf(stderr, "\nConfig testing complete.\n");
+               fflush(stderr);
+               return 0;       /* Why? We want the launcher to exit out. */
+       }
+
        check_class();
        write_pidfile(pidFileName);
        load_help();