*_heap declaration related to client.c are now in client.c + current_uid too

[solanum.git] / src / ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index 9d8f54fd8a3c5befc6fc274bb7fdd8e0c0d29665..952caeb98bfec76f6b8faee1a336297eb6321f2a 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -34,7 +34,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd_signal.h"
 #include "msg.h"               /* msgtab */
 #include "hostmask.h"
@@ -64,6 +64,7 @@
 #include "patchlevel.h"
 #include "serno.h"
 #include "sslproc.h"
+#include "chmode.h"
 
 /* /quote set variables */
 struct SetOptions GlobalSetOptions;
@@ -85,7 +86,6 @@ struct LocalUser meLocalUser; /* That's also part of me */
 
 rb_dlink_list lclient_list = { NULL, NULL, 0 };
 rb_dlink_list global_client_list = { NULL, NULL, 0 };
-rb_dlink_list global_channel_list = { NULL, NULL, 0 };
 
 rb_dlink_list unknown_list;        /* unknown clients ON this server only */
 rb_dlink_list serv_list;           /* local servers to this server ONLY */
@@ -119,18 +119,6 @@ int zlib_ok = 1;
 
 int testing_conf = 0;
 
-struct config_channel_entry ConfigChannel;
-rb_bh *channel_heap;
-rb_bh *ban_heap;
-rb_bh *topic_heap;
-rb_bh *member_heap;
-
-rb_bh *client_heap = NULL;
-rb_bh *lclient_heap = NULL;
-rb_bh *pclient_heap = NULL;
-
-char current_uid[IDLEN];
-
 /* patricia */
 rb_bh *prefix_heap;
 rb_bh *node_heap;
@@ -606,7 +594,7 @@ main(int argc, char *argv[])
 
        if(printVersion)
        {
-               printf("ircd: version %s\n", ircd_version);
+               printf("ircd: version %s(%s)\n", ircd_version, serno);
                exit(EXIT_SUCCESS);
        }
 
@@ -744,6 +732,7 @@ main(int argc, char *argv[])
        rb_dlinkAddAlloc(&me, &global_serv_list);
 
        construct_umodebuf();
+        construct_noparam_modes();
 
        check_class();
        write_pidfile(pidFileName);