Merge branch 'master' of github.com:charybdis-ircd/charybdis

[solanum.git] / ircd / ircd.c

diff --git a/ircd/ircd.c b/ircd/ircd.c
index e6ff1d2cafbeeb82676606e6ac561639dda6a892..432931deeaef6226732bc8c5a14857529af057ea 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -99,14 +99,14 @@ const char *logFileName = LPATH;
 const char *pidFileName = PPATH;
 
 char **myargv;
-int dorehash = 0;
-int dorehashbans = 0;
-int doremotd = 0;
-int kline_queued = 0;
-int server_state_foreground = 0;
-int opers_see_all_users = 0;
-int ssl_ok = 0;
-int zlib_ok = 1;
+bool dorehash = false;
+bool dorehashbans = false;
+bool doremotd = false;
+bool kline_queued = false;
+bool server_state_foreground = false;
+bool opers_see_all_users = false;
+bool ssl_ok = false;
+bool zlib_ok = true;
 
 int testing_conf = 0;
 time_t startup_time;
@@ -278,13 +278,13 @@ check_rehash(void *unused)
        if(dorehash)
        {
                rehash(1);
-               dorehash = 0;
+               dorehash = false;
        }
 
        if(dorehashbans)
        {
                rehash_bans(1);
-               dorehashbans = 0;
+               dorehashbans = false;
        }
 
        if(doremotd)
@@ -292,7 +292,7 @@ check_rehash(void *unused)
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Got signal SIGUSR1, reloading ircd motd file");
                cache_user_motd();
-               doremotd = 0;
+               doremotd = false;
        }
 }
 
@@ -605,7 +605,7 @@ charybdis_main(int argc, char *argv[])
        setup_signals();
 
        if (testing_conf)
-               server_state_foreground = 1;
+               server_state_foreground = true;
 
        /* Make sure fd 0, 1 and 2 are in use -- jilles */
        do
@@ -663,7 +663,7 @@ charybdis_main(int argc, char *argv[])
 
        init_auth();            /* Initialise the auth code */
        init_authd();           /* Start up authd. */
-       init_nameserver_cache();        /* Get our nameserver cache for STATS a/A */
+       init_dns();             /* Start up DNS query system */
 
        privilegeset_set_new("default", "", 0);
 
@@ -713,10 +713,10 @@ charybdis_main(int argc, char *argv[])
                if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params, ServerInfo.ssl_cipher_list))
                {
                        ilog(L_MAIN, "WARNING: Unable to setup SSL.");
-                       ssl_ok = 0;
+                       ssl_ok = false;
                }
                else
-                       ssl_ok = 1;
+                       ssl_ok = true;
        }
 
        if (testing_conf)