[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: Fixes a bug that has ben uncovered by an old nagios TAP test regarding

git at icinga.org git at icinga.org
Wed Sep 22 17:16:45 CEST 2010


Module: icinga-core
Branch: mfriedrich/core
Commit: 14849b8e6b916398570ea65c216f7e46d4b237b2
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=14849b8e6b916398570ea65c216f7e46d4b237b2

Author: Mike Becker <mike.becker at redpeppersworld.de>
Date:   Wed Sep 22 17:06:44 2010 +0200

Fixes a bug that has ben uncovered by an old nagios TAP test regarding
notifications and escalations
fixes #811

---

 xdata/xodtemplate.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xdata/xodtemplate.c b/xdata/xodtemplate.c
index fc91ea7..0b13483 100644
--- a/xdata/xodtemplate.c
+++ b/xdata/xodtemplate.c
@@ -1048,9 +1048,9 @@ int xodtemplate_begin_object_definition(char *input, int options, int config_fil
 
 	case XODTEMPLATE_SERVICEESCALATION:
 		xod_begin_def(serviceescalation);
-#ifdef USE_ST_BASED_ESCAL_RANGES
 		new_serviceescalation->first_notification=-2;
 		new_serviceescalation->last_notification=-2;
+#ifdef USE_ST_BASED_ESCAL_RANGES
 		new_serviceescalation->first_warning_notification=-2;
 		new_serviceescalation->last_warning_notification=-2;
 		new_serviceescalation->first_critical_notification=-2;
@@ -1126,9 +1126,9 @@ int xodtemplate_begin_object_definition(char *input, int options, int config_fil
 
 	case XODTEMPLATE_HOSTESCALATION:
 		xod_begin_def(hostescalation);
-#ifdef USE_ST_BASED_ESCAL_RANGES
 		new_hostescalation->first_notification=-2;
 		new_hostescalation->last_notification=-2;
+#ifdef USE_ST_BASED_ESCAL_RANGE		
 		new_hostescalation->first_down_notification=-2;
 		new_hostescalation->last_down_notification=-2;
 		new_hostescalation->first_unreachable_notification=-2;





More information about the icinga-checkins mailing list