Take a note why the explicit configDir variable is needed on Windows

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index ea08d020885829f19e058ef741f2bac03252344f..3849ca658a66d9bf4082c0302f9e2f5973477ad3 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -359,7 +359,10 @@ static int Main()
        GetUserName(username, &usernameLen);
 
        std::ifstream userFile;
-       userFile.open(Application::GetConst("ConfigDir") + "/user");
+
+       /* The implicit string assignment is needed for Windows builds. */
+       String configDir = Application::GetConst("ConfigDir");
+       userFile.open(configDir + "/user");
 
        if (userFile && command && !Application::IsProcessElevated()) {
                std::string userLine;

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index eda40a7fbfec0135cbf12730c45eec7709273661..ba20eb82341433222d22b446ca7d7e90c9653e9a 100644 (file)
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -205,6 +205,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
        if (vm.count("config") > 0)
                configs = vm["config"].as<std::vector<std::string> >();
        else if (!vm.count("no-config")) {
+               /* The implicit string assignment is needed for Windows builds. */
                String configDir = Application::GetConst("ConfigDir");
                configs.push_back(configDir + "/icinga2.conf");
        }