Merge branch 'master' into git

1 files changed, 9 insertions, 1 deletions

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 4b891ec512..20a270ff00 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -104,7 +104,15 @@ extern int main(int argc, char** argv)
         ++count;
     }
 
-    if (!sConfigMgr->LoadInitial(configFile))
+    std::string cfg_def_file=_TRINITY_REALM_CONFIG;
+    cfg_def_file += ".dist";
+
+    if (!sConfigMgr->LoadInitial(cfg_def_file.c_str())) {
+        printf("Invalid or missing default configuration file : %s\n", cfg_def_file.c_str());
+        return 1;
+    }
+
+    if (!sConfigMgr->LoadMore(configFile))
     {
         printf("Invalid or missing configuration file : %s\n", configFile);
         printf("Verify that the file exists and has \'[authserver]\' written in the top of the file!\n");