diff -r ab25c0a231d0 -r feb2f1e115c6 src/server/daemon/webserver.c --- a/src/server/daemon/webserver.c Mon May 06 13:44:27 2013 +0200 +++ b/src/server/daemon/webserver.c Mon May 06 14:54:40 2013 +0200 @@ -64,7 +64,9 @@ add_functions(webserver_funcs); // load init.conf - load_init_conf("config/init.conf"); + if(load_init_conf("config/init.conf")) { + return -1; + } // load server.conf init_configuration_manager(); @@ -98,7 +100,7 @@ setpwent(); if(!util_getpwnam(cfg->user.ptr, vars->Vuserpw, pwbuf, DEF_PWBUF)) { log_ereport( - LOG_LEVEL_ERROR, + LOG_MISCONFIG, "user %s does not exist!", cfg->user.ptr); free(vars->Vuserpw); @@ -114,30 +116,29 @@ if(setgid(vars->Vuserpw->pw_gid) != 0) { log_ereport( - LOG_LEVEL_ERROR, + LOG_FAILURE, "setgid(%d) failed", vars->Vuserpw->pw_gid); } else { // setgid was successful // we need to call initgroups to have all group permissions if(initgroups(vars->Vuserpw->pw_name, vars->Vuserpw->pw_gid)!=0) { - log_ereport(LOG_LEVEL_ERROR, "initgroups failed"); + log_ereport(LOG_FAILURE, "initgroups failed"); } } // change the uid if(setuid(vars->Vuserpw->pw_uid)) { log_ereport( - LOG_LEVEL_ERROR, + LOG_FAILURE, "setuid(%d) failed", vars->Vuserpw->pw_uid); } } else if(vars->Vuserpw) { log_ereport( - LOG_LEVEL_INFO, + LOG_WARN, "server must be started as root to change uid"); } - return 0; }