tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cli: Fix black/whitelist remove command 

refs #7526
This commit is contained in:
Michael Friedrich 2014-10-31 20:22:24 +01:00
parent ce4dcea21f
commit 6596192f2c
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cli/nodeblackandwhitelistcommand.cpp
View File

@ -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 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 (m_Command == BlackAndWhitelistCommandAdd) {
if (!vm.count("zone")) { if (!vm.count("zone")) {
Log(LogCritical, "cli", "At least the zone name filter is required!"); Log(LogCritical, "cli", "At least the zone name filter is required!");

1
lib/cli/nodeutility.cpp
View File

@ -483,7 +483,6 @@ int NodeUtility::RemoveBlackAndWhiteList(const String& type, const String& zone_
return 1; return 1;
} }
ObjectLock xlock(lists);
BOOST_FOREACH(int remove, remove_filters) { BOOST_FOREACH(int remove, remove_filters) {
lists->Remove(remove); lists->Remove(remove);
} }