Merge branch 'authd-framework' of github.com:charybdis-ircd/charybdis into authd...

[solanum.git] / ircd / ircd.c

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 8a16ffa48d052466062abe741e8f10c07b2f2889..5c576fc84fa63d23562ad7f06d614da659a9258c 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 */
@@ -782,7 +781,6 @@ charybdis_main(int argc, char *argv[])
        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 */
 
@@ -847,6 +845,8 @@ charybdis_main(int argc, char *argv[])
                return 0;       /* Why? We want the launcher to exit out. */
        }
 
+       configure_authd();
+
        me.from = &me;
        me.servptr = &me;
        SetMe(&me);