X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmain.c;h=b92bc21e58fa2d97a15ce2195a87ad15894e6f6c;hb=bb58415037ceff0a0668d4b8bd789ec947170b54;hp=10b9de3dce4bcdd923226dbf2a1816370d3fd10f;hpb=4c431fe65269e9b1d452855b9df8cfe80683b691;p=umurmur.git

diff --git a/src/main.c b/src/main.c
index 10b9de3..b92bc21 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -89,7 +89,7 @@ void lockfile(const char *pidfile)
 	}
 
 	snprintf(str,16,"%d\n", getpid());
-	write(lfp, str, strlen(str)); /* record pid to lockfile */
+	(void)write(lfp, str, strlen(str)); /* record pid to lockfile */
 	Log_info("PID-file: %s", pidfile);
 
 	/* If uMurmur ever starts to fork()+exec(), we don't want it to
@@ -195,11 +195,11 @@ void daemonize()
 		close(i); /* close all descriptors */
 	
 	i = open("/dev/null",O_RDWR);
-	dup(i);
-	dup(i);
+	(void)dup(i);
+	(void)dup(i);
 	
 	umask(027); /* set newly created file permissions */
-	chdir("/");
+	(void)chdir("/");
 		
 }
 
@@ -219,7 +219,8 @@ void setscheduler()
 
 void printhelp()
 {
-	printf("uMurmur version %s. Mumble protocol %d.%d.%d\n", UMURMUR_VERSION, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
+	printf("uMurmur version %s ('%s'). Mumble protocol %d.%d.%d\n", UMURMUR_VERSION,
+	       UMURMUR_CODENAME, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
 	printf("Usage: umurmurd [-d] [-r] [-h] [-p <pidfile>] [-t] [-c <conf file>] [-a <addr>] [-b <port>]\n");
 	printf("       -d             - Do not daemonize - run in foreground.\n");
 #ifdef POSIX_PRIORITY_SCHEDULING
@@ -336,6 +337,7 @@ int main(int argc, char **argv)
 	SSLi_init();
 	Chan_init();
 	Client_init();
+	Ban_init();
 
 #ifdef POSIX_PRIORITY_SCHEDULING
 	if (realtime)
@@ -344,6 +346,7 @@ int main(int argc, char **argv)
 	
 	Server_run();
 	
+	Ban_deinit();
 	SSLi_deinit();
 	Chan_free();
 	Log_free();