Fix parameter order for Acknowledge{,Svc,Host}Problem in API actions/external commands

It was preventing email notifications with default settings, as `persistent` defaults to false and therefore `notify` was not set.

Signed-off-by: Michael Friedrich <michael.friedrich@icinga.com>

diff --git a/lib/icinga/apiactions.cpp b/lib/icinga/apiactions.cpp
index 9d900524a9428f90547bf74dae38b62f799230d3..198bc9929b8f82aa4bae335843ad9cab2ea87463 100644 (file)
--- a/lib/icinga/apiactions.cpp
+++ b/lib/icinga/apiactions.cpp
@@ -232,7 +232,7 @@ Dictionary::Ptr ApiActions::AcknowledgeProblem(const ConfigObject::Ptr& object,
        Comment::AddComment(checkable, CommentAcknowledgement, HttpUtility::GetLastParameter(params, "author"),
            HttpUtility::GetLastParameter(params, "comment"), persistent, timestamp);
        checkable->AcknowledgeProblem(HttpUtility::GetLastParameter(params, "author"),
-           HttpUtility::GetLastParameter(params, "comment"), sticky, notify, timestamp);
+           HttpUtility::GetLastParameter(params, "comment"), sticky, notify, persistent, timestamp);
 
        return ApiActions::CreateResult(200, "Successfully acknowledged problem for object '" + checkable->GetName() + "'.");
 }

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index 04977924fca44213fb997627890f203ab1e61dac..6c3469f76c4761e3f2e36c0b49e950588de19510 100644 (file)
--- a/lib/icinga/externalcommandprocessor.cpp
+++ b/lib/icinga/externalcommandprocessor.cpp
@@ -635,7 +635,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblem(double, const std::vector<S
            << "Setting acknowledgement for service '" << service->GetName() << "'" << (notify ? "" : ". Disabled notification");
 
        Comment::AddComment(service, CommentAcknowledgement, arguments[5], arguments[6], persistent, 0);
-       service->AcknowledgeProblem(arguments[5], arguments[6], sticky ? AcknowledgementSticky : AcknowledgementNormal, persistent, notify);
+       service->AcknowledgeProblem(arguments[5], arguments[6], sticky ? AcknowledgementSticky : AcknowledgementNormal, notify, persistent);
 }
 
 void ExternalCommandProcessor::AcknowledgeSvcProblemExpire(double, const std::vector<String>& arguments)
@@ -699,7 +699,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblem(double, const std::vector<
                BOOST_THROW_EXCEPTION(std::invalid_argument("The host '" + arguments[0] + "' is OK."));
 
        Comment::AddComment(host, CommentAcknowledgement, arguments[4], arguments[5], persistent, 0);
-       host->AcknowledgeProblem(arguments[4], arguments[5], sticky ? AcknowledgementSticky : AcknowledgementNormal, persistent, notify);
+       host->AcknowledgeProblem(arguments[4], arguments[5], sticky ? AcknowledgementSticky : AcknowledgementNormal, notify, persistent);
 }
 
 void ExternalCommandProcessor::AcknowledgeHostProblemExpire(double, const std::vector<String>& arguments)