From: Gunnar Beutner <gunnar@beutner.name>
Date: Mon, 14 Mar 2016 07:45:12 +0000 (+0100)
Subject: Fix error handling for FeatureUtility::GetFeatures
X-Git-Tag: v2.5.0~482
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4066ab730aeff15e13ade0b0307b0193952ad0d9;p=icinga2

Fix error handling for FeatureUtility::GetFeatures

fixes #11349
---

diff --git a/lib/cli/featureutility.cpp b/lib/cli/featureutility.cpp
index 4d5d869f0..71845b2e8 100644
--- a/lib/cli/featureutility.cpp
+++ b/lib/cli/featureutility.cpp
@@ -197,30 +197,16 @@ int FeatureUtility::ListFeatures(std::ostream& os)
 
 bool FeatureUtility::GetFeatures(std::vector<String>& features, bool get_disabled)
 {
-	String path;
-
 	/* request all disabled features */
 	if (get_disabled) {
 		/* disable = available-enabled */
 		String available_pattern = GetFeaturesAvailablePath() + "/*.conf";
 		std::vector<String> available;
-
-		if (!Utility::Glob(available_pattern,
-		    boost::bind(&FeatureUtility::CollectFeatures, _1, boost::ref(available)), GlobFile)) {
-			Log(LogCritical, "cli")
-			    << "Cannot access path '" << path << "'.";
-			return false;
-		}
+		Utility::Glob(available_pattern, boost::bind(&FeatureUtility::CollectFeatures, _1, boost::ref(available)), GlobFile);
 
 		String enabled_pattern = GetFeaturesEnabledPath() + "/*.conf";
 		std::vector<String> enabled;
-
-		if (!Utility::Glob(enabled_pattern,
-		    boost::bind(&FeatureUtility::CollectFeatures, _1, boost::ref(enabled)), GlobFile)) {
-			Log(LogCritical, "cli")
-			    << "Cannot access path '" << path << "'.";
-			return false;
-		}
+		Utility::Glob(enabled_pattern, boost::bind(&FeatureUtility::CollectFeatures, _1, boost::ref(enabled)), GlobFile);
 
 		std::sort(available.begin(), available.end());
 		std::sort(enabled.begin(), enabled.end());
@@ -233,12 +219,7 @@ bool FeatureUtility::GetFeatures(std::vector<String>& features, bool get_disable
 		/* all enabled features */
 		String enabled_pattern = GetFeaturesEnabledPath() + "/*.conf";
 
-		if (!Utility::Glob(enabled_pattern,
-		    boost::bind(&FeatureUtility::CollectFeatures, _1, boost::ref(features)), GlobFile)) {
-			Log(LogCritical, "cli")
-			    << "Cannot access path '" << path << "'.";
-			return false;
-		}
+		Utility::Glob(enabled_pattern, boost::bind(&FeatureUtility::CollectFeatures, _1, boost::ref(features)), GlobFile);
 	}
 
 	return true;