diff -r afd57ce39ec9 -r b62e77d8e80c src/server/daemon/webserver.c
--- a/src/server/daemon/webserver.c	Mon Jul 08 11:10:54 2013 +0200
+++ b/src/server/daemon/webserver.c	Tue Jul 09 17:16:26 2013 +0200
@@ -71,7 +71,8 @@
 
     // load server.conf
     init_configuration_manager();
-    if(cfgmgr_load_config() != 0) {
+    ServerConfiguration *cfg;
+    if(cfgmgr_load_config(&cfg) != 0) {
         fprintf(stderr, "Cannot load configuration\n");
         return -1;
     }
@@ -80,7 +81,6 @@
     auth_cache_init();
     
     // create tmp dir and pid file
-    ServerConfiguration *cfg = cfgmgr_get_server_config();
     char *mkdir_cmd = NULL;
     asprintf(&mkdir_cmd, "mkdir -p %s", cfg->tmp.ptr);
     system(mkdir_cmd);