X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8dd8b3e2074ebe78e7b7c4f2998eab0c9fc1b122..ccfcd3519f5059681b9c8afa4ccc04b3fffd056b:/src/ircd.c?ds=sidebyside

diff --git a/src/ircd.c b/src/ircd.c
index b46ee03..217d011 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -34,9 +34,8 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd_signal.h"
-#include "sprintf_irc.h"
 #include "msg.h"		/* msgtab */
 #include "hostmask.h"
 #include "numeric.h"
@@ -65,6 +64,7 @@
 #include "patchlevel.h"
 #include "serno.h"
 #include "sslproc.h"
+#include "chmode.h"
 
 /* /quote set variables */
 struct SetOptions GlobalSetOptions;
@@ -388,10 +388,10 @@ initialize_global_set_options(void)
 
 	GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
 
-	strlcpy(GlobalSetOptions.operstring,
+	rb_strlcpy(GlobalSetOptions.operstring,
 		ConfigFileEntry.default_operstring,
 		sizeof(GlobalSetOptions.operstring));
-	strlcpy(GlobalSetOptions.adminstring,
+	rb_strlcpy(GlobalSetOptions.adminstring,
 		ConfigFileEntry.default_adminstring,
 		sizeof(GlobalSetOptions.adminstring));
 
@@ -607,7 +607,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);
 	}
 
@@ -696,7 +696,7 @@ main(int argc, char *argv[])
 		ierror("no server name specified in serverinfo block.");
 		return -1;
 	}
-	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
+	rb_strlcpy(me.name, ServerInfo.name, sizeof(me.name));
 
 	if(ServerInfo.sid[0] == '\0')
 	{
@@ -712,7 +712,7 @@ main(int argc, char *argv[])
 		ierror("no server description specified in serverinfo block.");
 		return -3;
 	}
-	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
+	rb_strlcpy(me.info, ServerInfo.description, sizeof(me.info));
 
 	if(ServerInfo.ssl_cert != NULL && ServerInfo.ssl_private_key != NULL)
 	{
@@ -745,6 +745,7 @@ main(int argc, char *argv[])
 	rb_dlinkAddAlloc(&me, &global_serv_list);
 
 	construct_umodebuf();
+        construct_noparam_modes();
 
 	check_class();
 	write_pidfile(pidFileName);