diff -r b62e77d8e80c -r 49bb6c8ceb2b src/server/daemon/configmanager.c --- a/src/server/daemon/configmanager.c Tue Jul 09 17:16:26 2013 +0200 +++ b/src/server/daemon/configmanager.c Tue Jul 09 20:56:01 2013 +0200 @@ -126,7 +126,9 @@ config = current_config; } - *set_cfg = config; + if(set_cfg) { + *set_cfg = config; + } ServerConfiguration *old_conf = NULL; if(current_config != config) { old_conf = current_config;