ircd: don't send ERR_NOTREGISTERED to servers

[solanum.git] / ircd / ircd.c

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 8a16ffa48d052466062abe741e8f10c07b2f2889..45f58db1214b22e4786e9d03ab3701e14d90977f 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -39,7 +39,6 @@
 #include "numeric.h"
 #include "parse.h"
 #include "restart.h"
-#include "s_auth.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "s_serv.h"            /* try_connections */
@@ -61,10 +60,11 @@
 #include "patchlevel.h"
 #include "serno.h"
 #include "sslproc.h"
+#include "wsproc.h"
 #include "chmode.h"
 #include "privilege.h"
 #include "bandbi.h"
-#include "authd.h"
+#include "authproc.h"
 #include "operhash.h"
 
 /* /quote set variables */
@@ -95,9 +95,9 @@ rb_dlink_list local_oper_list;     /* our opers, duplicated in lclient_list */
 rb_dlink_list oper_list;           /* network opers */
 
 char **myargv;
-bool dorehash = false;
-bool dorehashbans = false;
-bool doremotd = false;
+volatile sig_atomic_t dorehash = false;
+volatile sig_atomic_t dorehashbans = false;
+volatile sig_atomic_t doremotd = false;
 bool kline_queued = false;
 bool server_state_foreground = false;
 bool opers_see_all_users = false;
@@ -779,10 +779,6 @@ charybdis_main(int argc, char *argv[])
 
         construct_cflags_strings();
 
-       load_all_modules(1);
-       load_core_modules(1);
-
-       init_auth();            /* Initialise the auth code */
        init_authd();           /* Start up authd. */
        init_dns();             /* Start up DNS query system */
 
@@ -794,11 +790,14 @@ charybdis_main(int argc, char *argv[])
 
        mod_add_path(MODULE_DIR);
        mod_add_path(MODULE_DIR "/autoload");
+       load_all_modules(1);
+       load_core_modules(1);
 
        init_isupport();
 
        init_bandb();
        init_ssld();
+       init_wsockd();
 
        rehash_bans();
 
@@ -865,6 +864,8 @@ charybdis_main(int argc, char *argv[])
        load_help();
        open_logfiles();
 
+       configure_authd();
+
        ilog(L_MAIN, "Server Ready");
 
        /* We want try_connections to be called as soon as possible now! -- adrian */