X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=blobdiff_plain;f=src%2Fmain.c;h=d98fb6aca3a89b42fa3d4fbe2d21d51cd74208ec;hp=929af5c951b3d28a7a09685ca6599b5bcfb2ac85;hb=571e132795d595c7c4ce39b5b1bc9aae6a72f4cd;hpb=336d27baf938a957177e4c26c2b5c6c4172aa0a6

diff --git a/src/main.c b/src/main.c
index 929af5c..d98fb6a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -56,6 +56,7 @@
 #include "version.h"
 #include "config.h"
 #include "sharedmemory.h"
+#include "ban.h"
 
 char system_string[64], version_string[64];
 int bindport;
@@ -198,6 +199,10 @@ void daemonize()
 	for (i = getdtablesize(); i >= 0; --i)
 		close(i); /* close all descriptors */
 
+#ifdef USE_GNUTLS
+	 gnutls_global_init();
+#endif
+
 	i = open("/dev/null",O_RDWR);
 	(void)dup(i);
 	(void)dup(i);
@@ -317,13 +322,6 @@ int main(int argc, char **argv)
 			Log_init(false);
 			if (pidfile != NULL)
 				lockfile(pidfile);
-
-			switch_user();
-
-			/* Reopen log file. If user switch results in access denied, we catch
-			 * it early.
-			 */
-			Log_reset();
 		}
 		else Log_init(true);
 
@@ -350,16 +348,28 @@ int main(int argc, char **argv)
 		Chan_init();
 		Client_init();
 		Ban_init();
-    Sharedmemory_init();
-    
+
+#ifdef USE_SHAREDMEMORY_API
+    Sharedmemory_init( bindport, bindport6 );
+#endif
+
 #ifdef POSIX_PRIORITY_SCHEDULING
 		if (realtime)
 			setscheduler();
 #endif
 
+		switch_user();
+		/* Reopen log file. If user switch results in access denied, we catch
+		 * it early.
+		 */
+		Log_reset();
+
 		Server_run();
 
+#ifdef USE_SHAREDMEMORY_API
     Sharedmemory_deinit();
+#endif
+
 		Ban_deinit();
 		SSLi_deinit();
 		Chan_free();