Do user switch after SSL keys are initialized

[umurmur.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 929af5c951b3d28a7a09685ca6599b5bcfb2ac85..d98fb6aca3a89b42fa3d4fbe2d21d51cd74208ec 100644 (file)
--- 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();