From a2a1f5c8d212b74d925f3b7f19d9bde52935bed8 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Tue, 7 Aug 2018 18:33:59 +0200
Subject: [PATCH] Take a note why the explicit configDir variable is needed on
 Windows

---
 icinga-app/icinga.cpp     | 5 ++++-
 lib/cli/daemoncommand.cpp | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index ea08d0208..3849ca658 100644
--- 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 eda40a7fb..ba20eb823 100644
--- 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");
 	}