From: Michael Friedrich <michael.friedrich@netways.de>
Date: Fri, 31 Oct 2014 19:22:24 +0000 (+0100)
Subject: Cli: Fix black/whitelist remove command
X-Git-Tag: v2.2.0~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6596192f2cb87b030fe545313f5f50563cef73f5;p=icinga2

Cli: Fix black/whitelist remove command

refs #7526
---

diff --git a/lib/cli/nodeblackandwhitelistcommand.cpp b/lib/cli/nodeblackandwhitelistcommand.cpp
index 533c447a7..927f0ea58 100644
--- a/lib/cli/nodeblackandwhitelistcommand.cpp
+++ b/lib/cli/nodeblackandwhitelistcommand.cpp
@@ -122,14 +122,6 @@ void BlackAndWhitelistCommand::InitParameters(boost::program_options::options_de
  */
 int BlackAndWhitelistCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
 {
-	String list_path = NodeUtility::GetRepositoryPath() + "/" + m_Type + ".list";
-
-	Dictionary::Ptr lists = make_shared<Dictionary>();
-
-	if (Utility::PathExists(list_path)) {
-		lists = Utility::LoadJsonFile(list_path);
-	}
-
 	if (m_Command == BlackAndWhitelistCommandAdd) {
 		if (!vm.count("zone")) {
 			Log(LogCritical, "cli", "At least the zone name filter is required!");
diff --git a/lib/cli/nodeutility.cpp b/lib/cli/nodeutility.cpp
index c6435e894..833e67059 100644
--- a/lib/cli/nodeutility.cpp
+++ b/lib/cli/nodeutility.cpp
@@ -483,7 +483,6 @@ int NodeUtility::RemoveBlackAndWhiteList(const String& type, const String& zone_
 		return 1;
 	}
 
-	ObjectLock xlock(lists);
 	BOOST_FOREACH(int remove, remove_filters) {
 		lists->Remove(remove);
 	}