From: Michael Friedrich <michael.friedrich@netways.de>
Date: Mon, 3 Aug 2015 08:17:12 +0000 (+0200)
Subject: Fix S_ISDIR on Windows
X-Git-Tag: v2.4.0~452
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f47c1badcc76ae7aaaa19808c63efa56bcb9b20;p=icinga2

Fix S_ISDIR on Windows

fixes #9813
---

diff --git a/lib/remote/configmoduleutility.cpp b/lib/remote/configmoduleutility.cpp
index feac2bc0a..7e87507cc 100644
--- a/lib/remote/configmoduleutility.cpp
+++ b/lib/remote/configmoduleutility.cpp
@@ -262,6 +262,8 @@ void ConfigModuleUtility::CollectPaths(const String& path, std::vector<std::pair
 		    << boost::errinfo_api_function("lstat")
 		    << boost::errinfo_errno(errno)
 		    << boost::errinfo_file_name(path));
+
+	paths.push_back(std::make_pair(path, S_ISDIR(statbuf.st_mode)));
 #else /* _WIN32 */
 	struct _stat statbuf;
 	int rc = _stat(path.CStr(), &statbuf);
@@ -270,9 +272,9 @@ void ConfigModuleUtility::CollectPaths(const String& path, std::vector<std::pair
 		    << boost::errinfo_api_function("_stat")
 		    << boost::errinfo_errno(errno)
 		    << boost::errinfo_file_name(path));
-#endif /* _WIN32 */
 
-	paths.push_back(std::make_pair(path, S_ISDIR(statbuf.st_mode)));
+	paths.push_back(std::make_pair(path, ((statbuf.st_mode & S_IFMT) == S_IFDIR)));
+#endif /* _WIN32 */
 }
 
 bool ConfigModuleUtility::ContainsDotDot(const String& path)