kill patricia.c

[solanum.git] / src / ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index dd1264f830c2da38b968e3d57e674830bf6e8d8b..40993b1baf4e546282a5ad22f96f27d172bc1a4f 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -111,6 +111,12 @@ ircd_log_cb(const char *str)
        ilog(L_MAIN, "%s", str);
 }
 
+static void
+ircd_restart_cb(const char *str)
+{
+       ilog(L_MAIN, "%s", str);
+}
+
 /*
  * Why EXIT_FAILURE here?
  * Because if ircd_die_cb() is called it's because of a fatal
@@ -554,6 +560,7 @@ main(int argc, char *argv[])
        /* Init the event subsystem */
        init_sys();
        libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
+       rb_lib_init(ircd_log_cb, restart, ircd_die_cb);
 
        fdlist_init();
        if(!server_state_foreground)
@@ -635,10 +642,10 @@ main(int argc, char *argv[])
        me.servptr = &me;
        SetMe(&me);
        make_server(&me);
-       me.serv->up = me.name;
        startup_time = CurrentTime;
        add_to_client_hash(me.name, &me);
        add_to_id_hash(me.id, &me);
+       me.serv->nameinfo = scache_connect(me.name, me.info, 0);
 
        dlinkAddAlloc(&me, &global_serv_list);
 
@@ -668,12 +675,6 @@ main(int argc, char *argv[])
 
        eventAdd("check_rehash", check_rehash, NULL, 1);
 
-       if(ConfigServerHide.links_delay > 0)
-               eventAdd("cache_links", cache_links, NULL,
-                           ConfigServerHide.links_delay);
-       else
-               ConfigServerHide.links_disabled = 1;
-
        if(splitmode)
                eventAdd("check_splitmode", check_splitmode, NULL, 2);