From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Sat, 9 Feb 2013 18:12:30 +0000 (+0100)
Subject: Build fix.
X-Git-Tag: v0.0.2~473
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=962d0e5fb24f4e7a5867bf22f98dc1e0a6649468;p=icinga2

Build fix.
---

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 41f6c282a..742099348 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -437,9 +437,9 @@ Dictionary::Ptr Host::CalculateDynamicMacros(void) const
 
 	if (hostcheck) {
 		macros->Set("HOSTSTATEID", 99);
-		macros->Set("HOSTSTATETYPE", Service::StateTypeToString(hostcheck->GetStateType());
-		macros->Set("HOSTATTEMPT", hostcheck->GetCurrentAttempt());
-		macros->Set("MAXHOSTATTEMPT", hostcheck->GetMaxAttempts());
+		macros->Set("HOSTSTATETYPE", Service::StateTypeToString(hostcheck->GetStateType()));
+		macros->Set("HOSTATTEMPT", hostcheck->GetCurrentCheckAttempt());
+		macros->Set("MAXHOSTATTEMPT", hostcheck->GetMaxCheckAttempts());
 	}
 
 	return macros;
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 4563e1716..da7b19384 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -278,8 +278,8 @@ Dictionary::Ptr Service::CalculateDynamicMacros(void) const
 	macros->Set("SERVICESTATE", StateToString(GetState()));
 	macros->Set("SERVICESTATEID", GetState());
 	macros->Set("SERVICESTATETYPE", StateTypeToString(GetStateType()));
-	macros->Set("SERVICEATTEMPT", GetCurrentAttempt());
-	macros->Set("MAXSERVICEATTEMPT", GetMaxAttempts());
+	macros->Set("SERVICEATTEMPT", GetCurrentCheckAttempt());
+	macros->Set("MAXSERVICEATTEMPT", GetMaxCheckAttempts());
 
 	return macros;
 }