Merge topic branch t/play into pu

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 0df82e000bc491d6de9e1333fb3241446674e49d..141cd6de5de41944fc1b2d9570ab6263b5f1d8cc 100644 (file)
--- a/server.c
+++ b/server.c
@@ -228,17 +228,12 @@ void parse_config_or_die(bool reload)
                daemon_set_flag(DF_LOG_TIMING);
        daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
        if (!reload || getpid() != afs_pid) {
-               char *user_list_file;
-               if (OPT_GIVEN(USER_LIST))
-                       user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST));
-               else {
-                       const char *home = get_homedir();
-                       user_list_file = make_message("%s/.paraslash/server.users", home);
-               }
+               char *user_list_file = OPT_GIVEN(USER_LIST)?
+                       para_strdup(OPT_STRING_VAL(USER_LIST)) :
+                       make_message("%s/server.users", get_confdir());
                user_list_init(user_list_file);
                free(user_list_file);
        }
-       return;
 }
 
 /*