From bcc17be2cab69b7a0e70ca00c4a3e65ab404ece7 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <Michael.Friedrich@netways.de>
Date: Wed, 19 Mar 2014 22:08:28 +0100
Subject: [PATCH] Fix missing lock and clear ack comments in
 RemoveHostAcknowledgement().

---
 lib/icinga/externalcommandprocessor.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index 50a8ba452..e752707c4 100644
--- a/lib/icinga/externalcommandprocessor.cpp
+++ b/lib/icinga/externalcommandprocessor.cpp
@@ -733,8 +733,13 @@ void ExternalCommandProcessor::RemoveHostAcknowledgement(double, const std::vect
 
 	Log(LogInformation, "icinga", "Removing acknowledgement for host '" + host->GetName() + "'");
 	Service::Ptr service = host->GetCheckService();
-	if (service)
-		service->ClearAcknowledgement();
+	if (service) {
+		{
+			ObjectLock olock(service);
+			service->ClearAcknowledgement();
+		}
+		service->RemoveCommentsByType(CommentAcknowledgement);
+	}
 }
 
 void ExternalCommandProcessor::EnableHostgroupSvcChecks(double, const std::vector<String>& arguments)
-- 
2.40.0