From 5ec2349f644a90cc8a1485725130f6afa5c0e317 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <Michael.Friedrich@netways.de>
Date: Wed, 19 Mar 2014 23:08:01 +0100
Subject: [PATCH] Clear sticky ack on soft recovery, fix sticky=2, normal=1|0.

Fixes #5365
---
 lib/icinga/externalcommandprocessor.cpp | 8 ++++----
 lib/icinga/service-check.cpp            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index e752707c4..764b32f12 100644
--- a/lib/icinga/externalcommandprocessor.cpp
+++ b/lib/icinga/externalcommandprocessor.cpp
@@ -616,7 +616,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblem(double, const std::vector<S
 	if (arguments.size() < 7)
 		BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 7 arguments."));
 
-	bool sticky = Convert::ToBool(arguments[2]);
+	bool sticky = (Convert::ToLong(arguments[2]) == 2 ? true : false);
 
 	Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]);
 
@@ -637,7 +637,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblemExpire(double, const std::ve
 	if (arguments.size() < 8)
 		BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 8 arguments."));
 
-	bool sticky = Convert::ToBool(arguments[2]);
+	bool sticky = (Convert::ToLong(arguments[2]) == 2 ? true : false);
 	double timestamp = Convert::ToDouble(arguments[5]);
 
 	Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]);
@@ -679,7 +679,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblem(double, const std::vector<
 	if (arguments.size() < 6)
 		BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 6 arguments."));
 
-	bool sticky = Convert::ToBool(arguments[1]);
+	bool sticky = (Convert::ToLong(arguments[1]) == 2 ? true : false);
 
 	Host::Ptr host = Host::GetByName(arguments[0]);
 
@@ -702,7 +702,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblemExpire(double, const std::v
 	if (arguments.size() < 7)
 		BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 7 arguments."));
 
-	bool sticky = Convert::ToBool(arguments[1]);
+	bool sticky = (Convert::ToLong(arguments[1]) == 2 ? true : false);
 	double timestamp = Convert::ToDouble(arguments[4]);
 
 	Host::Ptr host = Host::GetByName(arguments[0]);
diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp
index f3b87bdcf..67a1b512f 100644
--- a/lib/icinga/service-check.cpp
+++ b/lib/icinga/service-check.cpp
@@ -319,7 +319,7 @@ void Service::ProcessCheckResult(const CheckResult::Ptr& cr, const String& autho
 
 		/* remove acknowledgements */
 		if (GetAcknowledgement() == AcknowledgementNormal ||
-		    (GetAcknowledgement() == AcknowledgementSticky && GetStateType() == StateTypeHard && GetState() == StateOK)) {
+		    (GetAcknowledgement() == AcknowledgementSticky && GetState() == StateOK)) {
 			ClearAcknowledgement();
 		}