Nagios

Revision: 2208
          http://nagios.svn.sourceforge.net/nagios/?rev=2208&view=rev
Author:   ageric
Date:     2012-09-13 05:32:02 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
xdata/xodtemplate: Reset child list for same-host servicedependencies

Otherwise we should (technically) get an ever-increasing list of
objects to choose from and duplicate servicedependencies as if they
were porn on a torrent site.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:31:44 UTC (rev 2207)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:32:02 UTC (rev 2208)
@@ -4940,6 +4940,7 @@
 		 */
 		if(same_host) {
 			bitmap_clear(service_map);
+			children = NULL;
 			if(xodtemplate_expand_services(&children, service_map, p->host_name, dsdesc, temp_servicedependency->_config_file, temp_servicedependency->_start_line) != OK)
 				return ERROR;
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2209
          http://nagios.svn.sourceforge.net/nagios/?rev=2209&view=rev
Author:   ageric
Date:     2012-09-13 05:32:20 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
xdata/xodtemplate: Fix serviceescalations on hostgroups

Previously we used to bail out early if there was no host_name set,
but serviceescalations can be assigned to hostgroups too. This patch
restores the old functionality.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:32:02 UTC (rev 2208)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:32:20 UTC (rev 2209)
@@ -4358,7 +4358,7 @@
 	for(temp_serviceescalation = xodtemplate_serviceescalation_list; temp_serviceescalation != NULL; temp_serviceescalation = temp_serviceescalation->next) {
 
 		/* skip serviceescalations without enough data */
-		if(temp_serviceescalation->service_description == NULL || temp_serviceescalation->host_name == NULL)
+		if(temp_serviceescalation->service_description == NULL && (temp_serviceescalation->host_name == NULL || temp_serviceescalation->hostgroup_name == NULL))
 			continue;
 
 		bitmap_clear(service_map);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2210
          http://nagios.svn.sourceforge.net/nagios/?rev=2210&view=rev
Author:   ageric
Date:     2012-09-13 05:32:38 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
xdata: Add serviceescalations with the host_name from the service

We want to get rid of as much memory as quickly as possible, and
assigning variables is one of the fastest ways to do that. We trust
in valgrind to let us know if we screw up somehow.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:32:20 UTC (rev 2209)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:32:38 UTC (rev 2210)
@@ -4391,7 +4391,7 @@
 				}
 
 			/* duplicate service escalation definition */
-			result = xodtemplate_duplicate_serviceescalation(temp_serviceescalation, temp_serviceescalation->host_name, s->service_description);
+			result = xodtemplate_duplicate_serviceescalation(temp_serviceescalation, s->host_name, s->service_description);
 
 			/* exit on error */
 			if(result == ERROR) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2211
          http://nagios.svn.sourceforge.net/nagios/?rev=2211&view=rev
Author:   ageric
Date:     2012-09-13 05:32:59 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
xod: Avoid duplicating serviceescalations we shouldn't register

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:32:38 UTC (rev 2210)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:32:59 UTC (rev 2211)
@@ -4360,6 +4360,8 @@
 		/* skip serviceescalations without enough data */
 		if(temp_serviceescalation->service_description == NULL && (temp_serviceescalation->host_name == NULL || temp_serviceescalation->hostgroup_name == NULL))
 			continue;
+		if(temp_serviceescalation->register_object == FALSE)
+			continue;
 
 		bitmap_clear(service_map);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2213
          http://nagios.svn.sourceforge.net/nagios/?rev=2213&view=rev
Author:   ageric
Date:     2012-09-13 13:55:41 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
xod: Make the damn cgi's build again

Seriously... This is getting retarded. I'll have to get me a
pre-commit hook that just tries a 'make all' on what I'm about to
commit...

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 05:33:26 UTC (rev 2212)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 13:55:41 UTC (rev 2213)
@@ -118,8 +118,9 @@
 
 #ifndef NSCGI
 /* reusable bitmaps for expanding objects */
-static bitmap *service_map, *parent_map, *host_map, *contact_map;
+static bitmap *service_map, *host_map, *contact_map;
 #endif
+static bitmap *parent_map;
 
 /* returns the name of a numbered config file */
 static char *xodtemplate_config_file_name(int config_file) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2214
          http://nagios.svn.sourceforge.net/nagios/?rev=2214&view=rev
Author:   ageric
Date:     2012-09-14 09:05:33 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
xod: Be more verbose when warning about deprecated variables

This makes it easier to find and fix the problem areas.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-13 13:55:41 UTC (rev 2213)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-14 09:05:33 UTC (rev 2214)
@@ -1090,9 +1090,10 @@
 
 	}
 
-static void xodtemplate_obsoleted(const char *var) {
-	logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: %s is obsoleted and no longer has any effect in %s type objects\n",
-		 var, xodtemplate_type_name(xodtemplate_current_object_type));
+static void xodtemplate_obsoleted(const char *var, int start_line) {
+	logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: %s is obsoleted and no longer has any effect in %s type objects (config file '%s', starting at line %d)\n",
+		 var, xodtemplate_type_name(xodtemplate_current_object_type),
+		 xodtemplate_config_file_name(xodtemplate_current_config_file), start_line);
 	}
 
 /* adds a property to an object definition */
@@ -2354,7 +2355,7 @@
 				temp_host->have_event_handler = TRUE;
 				}
 			else if(!strcmp(variable, "failure_prediction_options")) {
-				xodtemplate_obsoleted(variable);
+				xodtemplate_obsoleted(variable, temp_host->_start_line);
 				}
 			else if(!strcmp(variable, "notes")) {
 				if(strcmp(value, XODTEMPLATE_NULL)) {
@@ -2568,7 +2569,7 @@
 				temp_host->have_process_perf_data = TRUE;
 				}
 			else if(!strcmp(variable, "failure_prediction_enabled")) {
-				xodtemplate_obsoleted(variable);
+				xodtemplate_obsoleted(variable, temp_host->_start_line);
 				}
 			else if(!strcmp(variable, "2d_coords")) {
 				if((temp_ptr = strtok(value, ", ")) == NULL) {
@@ -2800,7 +2801,7 @@
 				temp_service->have_contacts = TRUE;
 				}
 			else if(!strcmp(variable, "failure_prediction_options")) {
-				xodtemplate_obsoleted(variable);
+				xodtemplate_obsoleted(variable, temp_service->_start_line);
 				}
 			else if(!strcmp(variable, "notes")) {
 				if(strcmp(value, XODTEMPLATE_NULL)) {
@@ -3027,7 +3028,7 @@
 				temp_service->have_process_perf_data = TRUE;
 				}
 			else if(!strcmp(variable, "failure_prediction_enabled")) {
-				xodtemplate_obsoleted(variable);
+				xodtemplate_obsoleted(variable, temp_service->_start_line);
 				}
 			else if(!strcmp(variable, "retain_status_information")) {
 				temp_service->retain_status_information = (atoi(value) > 0) ? TRUE : FALSE;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2215
          http://nagios.svn.sourceforge.net/nagios/?rev=2215&view=rev
Author:   ageric
Date:     2012-09-14 09:05:52 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
xod: Add a missing timing point

Inheriting object properties can take a considerable amount of time,
so we'd better tell people where we spent it.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-14 09:05:33 UTC (rev 2214)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-14 09:05:52 UTC (rev 2215)
@@ -392,6 +392,7 @@
 		/* NOTE: some missing defaults (notification options, etc.) are also applied here */
 		if(result == OK)
 			result = xodtemplate_inherit_object_properties();
+		timing_point("Done propagating inherited object properties\n");
 		if(test_scheduling == TRUE)
 			gettimeofday(&tv[8], NULL);
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2217
          http://nagios.svn.sourceforge.net/nagios/?rev=2217&view=rev
Author:   ageric
Date:     2012-09-14 13:22:27 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
xod: Avoid strdup()'ing alias and address for hosts

We assign them in add_host() anyway, so this was just a waste of
cycles.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-14 09:06:22 UTC (rev 2216)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-14 13:22:27 UTC (rev 2217)
@@ -8008,14 +8008,8 @@
 	if(this_host->register_object == FALSE)
 		return OK;
 
-	/* if host has no alias or address, use host name - added 3/11/05 */
-	if(this_host->alias == NULL && this_host->host_name != NULL)
-		this_host->alias = (char *)strdup(this_host->host_name);
-	if(this_host->address == NULL && this_host->host_name != NULL)
-		this_host->address = (char *)strdup(this_host->host_name);
-
 	/* add the host definition */
-	new_host = add_host(this_host->host_name, this_host->display_name, this_host->alias, (this_host->address == NULL) ? this_host->host_name : this_host->address, this_host->check_period, this_host->initial_state, this_host->check_interval, this_host->retry_interval, this_host->max_check_attempts, this_host->notify_on_recovery, this_host->notify_on_down, this_host->notify_on_unreachable, this_host->notify_on_flapping, this_host->notify_on_downtime, this_host->notification_interval, this_host->first_notification_delay, this_host->notification_period, this_host->notifications_enabled, this_host->check_command, this_host->active_checks_enabled, this_host->passive_checks_enabled, this_host->event_handler, this_host->event_handler_enabled, this_host->flap_detection_enabled, this_host->low_flap_threshold, this_host->high_flap_threshold, this_host->flap_detection_on_up, this_host->flap_detection_on_down, this_host->flap_detection_on_unreachable, this_host->stalk_on_up, this_host->stalk_on_down, this_host->stalk_on_unreachable, this_host->process_perf_data, this_host->check_freshness, this_host->freshness_threshold, this_host->notes, this_host->notes_url, this_host->action_url, this_host->icon_image, this_host->icon_image_alt, this_host->vrml_image, this_host->statusmap_image, this_host->x_2d, this_host->y_2d, this_host->have_2d_coords, this_host->x_3d, this_host->y_3d, this_host->z_3d, this_host->have_3d_coords, TRUE, this_host->retain_status_information, this_host->retain_nonstatus_information, this_host->obsess);
+	new_host = add_host(this_host->host_name, this_host->display_name, this_host->alias, this_host->address, this_host->check_period, this_host->initial_state, this_host->check_interval, this_host->retry_interval, this_host->max_check_attempts, this_host->notify_on_recovery, this_host->notify_on_down, this_host->notify_on_unreachable, this_host->notify_on_flapping, this_host->notify_on_downtime, this_host->notification_interval, this_host->first_notification_delay, this_host->notification_period, this_host->notifications_enabled, this_host->check_command, this_host->active_checks_enabled, this_host->passive_checks_enabled, this_host->event_handler, this_host->event_handler_enabled, this_host->flap_detection_enabled, this_host->low_flap_threshold, this_host->high_flap_threshold, this_host->flap_detection_on_up, this_host->flap_detection_on_down, this_host->flap_detection_on_unreachable, this_host->stalk_on_up, this_host->stalk_on_down, this_host->stalk_on_unreachable, this_host->process_perf_data, this_host->check_freshness, this_host->freshness_threshold, this_host->notes, this_host->notes_url, this_host->action_url, this_host->icon_image, this_host->icon_image_alt, this_host->vrml_image, this_host->statusmap_image, this_host->x_2d, this_host->y_2d, this_host->have_2d_coords, this_host->x_3d, this_host->y_3d, this_host->z_3d, this_host->have_3d_coords, TRUE, this_host->retain_status_information, this_host->retain_nonstatus_information, this_host->obsess);
 
 
 	/* return with an error if we couldn't add the host */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2222
          http://nagios.svn.sourceforge.net/nagios/?rev=2222&view=rev
Author:   ageric
Date:     2012-09-15 13:56:39 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
xod: Add and use a few function-style xod_inherit macros

This makes it a lot more pleasant to add new variables to the object
configuration.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-15 13:56:23 UTC (rev 2221)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-15 13:56:39 UTC (rev 2222)
@@ -4999,8 +4999,30 @@
 	return OK;
 	}
 
+/* simple inheritance macros. o = object, t = template, v = variable */
+#define xod_inherit(o, t, v) \
+	do { \
+		if(o->have_##v == FALSE && t->have_##v == TRUE) { \
+			o->v = t->v; \
+			o->have_##v = TRUE; \
+		} \
+	} while(0)
 
+#define xod_inherit_str_nohave(o, t, v) \
+	do { \
+		if(o->v == NULL && t->v != NULL) { \
+			o->v = (char *)strdup(t->v); \
+		} \
+	} while(0)
 
+#define xod_inherit_str(o, t, v) \
+	do { \
+		if(o->have_##v == FALSE && t->have_##v == TRUE) { \
+			xod_inherit_str_nohave(o, t, v); \
+			o->have_##v = TRUE; \
+		} \
+	} while(0)
+
 /* resolves a timeperiod object */
 int xodtemplate_resolve_timeperiod(xodtemplate_timeperiod *this_timeperiod) {
 	char *temp_ptr = NULL;
@@ -5041,17 +5063,12 @@
 		xodtemplate_resolve_timeperiod(template_timeperiod);
 
 		/* apply missing properties from template timeperiod... */
-		if(this_timeperiod->timeperiod_name == NULL && template_timeperiod->timeperiod_name != NULL)
-			this_timeperiod->timeperiod_name = (char *)strdup(template_timeperiod->timeperiod_name);
-		if(this_timeperiod->alias == NULL && template_timeperiod->alias != NULL)
-			this_timeperiod->alias = (char *)strdup(template_timeperiod->alias);
-		if(this_timeperiod->exclusions == NULL && template_timeperiod->exclusions != NULL)
-			this_timeperiod->exclusions = (char *)strdup(template_timeperiod->exclusions);
-		for(x = 0; x < 7; x++) {
-			if(this_timeperiod->timeranges[x] == NULL && template_timeperiod->timeranges[x] != NULL) {
-				this_timeperiod->timeranges[x] = (char *)strdup(template_timeperiod->timeranges[x]);
-				}
-			}
+		xod_inherit_str_nohave(this_timeperiod, template_timeperiod, timeperiod_name);
+		xod_inherit_str_nohave(this_timeperiod, template_timeperiod, alias);
+		xod_inherit_str_nohave(this_timeperiod, template_timeperiod, exclusions);
+		for(x = 0; x < 7; x++)
+			xod_inherit_str_nohave(this_timeperiod, template_timeperiod, timeranges[x]);
+
 		/* daterange exceptions require more work to apply missing ranges... */
 		for(x = 0; x < DATERANGE_TYPES; x++) {
 			for(template_daterange = template_timeperiod->exceptions[x]; template_daterange != NULL; template_daterange = template_daterange->next) {
@@ -5136,10 +5153,8 @@
 		xodtemplate_resolve_command(template_command);
 
 		/* apply missing properties from template command... */
-		if(this_command->command_name == NULL && template_command->command_name != NULL)
-			this_command->command_name = (char *)strdup(template_command->command_name);
-		if(this_command->command_line == NULL && template_command->command_line != NULL)
-			this_command->command_line = (char *)strdup(template_command->command_line);
+		xod_inherit_str_nohave(this_command, template_command, command_name);
+		xod_inherit_str_nohave(this_command, template_command, command_line);
 		}
 
 	my_free(template_names);
@@ -5186,10 +5201,8 @@
 		xodtemplate_resolve_contactgroup(template_contactgroup);
 
 		/* apply missing properties from template contactgroup... */
-		if(this_contactgroup->contactgroup_name == NULL && template_contactgroup->contactgroup_name != NULL)
-			this_contactgroup->contactgroup_name = (char *)strdup(template_contactgroup->contactgroup_name);
-		if(this_contactgroup->alias == NULL && template_contactgroup->alias != NULL)
-			this_contactgroup->alias = (char *)strdup(template_contactgroup->alias);
+		xod_inherit_str_nohave(this_contactgroup, template_contactgroup, contactgroup_name);
+		xod_inherit_str_nohave(this_contactgroup, template_contactgroup, alias);
 
 		xodtemplate_get_inherited_string(&template_contactgroup->have_members, &template_contactgroup->members, &this_contactgroup->have_members, &this_contactgroup->members);
 		xodtemplate_get_inherited_string(&template_contactgroup->have_contactgroup_members, &template_contactgroup->contactgroup_members, &this_contactgroup->have_contactgroup_members, &this_contactgroup->contactgroup_members);
@@ -5240,29 +5253,15 @@
 		xodtemplate_resolve_hostgroup(template_hostgroup);
 
 		/* apply missing properties from template hostgroup... */
-		if(this_hostgroup->hostgroup_name == NULL && template_hostgroup->hostgroup_name != NULL)
-			this_hostgroup->hostgroup_name = (char *)strdup(template_hostgroup->hostgroup_name);
-		if(this_hostgroup->alias == NULL && template_hostgroup->alias != NULL)
-			this_hostgroup->alias = (char *)strdup(template_hostgroup->alias);
+		xod_inherit_str_nohave(this_hostgroup, template_hostgroup, hostgroup_name);
+		xod_inherit_str_nohave(this_hostgroup, template_hostgroup, alias);
 
 		xodtemplate_get_inherited_string(&template_hostgroup->have_members, &template_hostgroup->members, &this_hostgroup->have_members, &this_hostgroup->members);
 		xodtemplate_get_inherited_string(&template_hostgroup->have_hostgroup_members, &template_hostgroup->hostgroup_members, &this_hostgroup->have_hostgroup_members, &this_hostgroup->hostgroup_members);
 
-		if(this_hostgroup->have_notes == FALSE && template_hostgroup->have_notes == TRUE) {
-			if(this_hostgroup->notes == NULL && template_hostgroup->notes != NULL)
-				this_hostgroup->notes = (char *)strdup(template_hostgroup->notes);
-			this_hostgroup->have_notes = TRUE;
-			}
-		if(this_hostgroup->have_notes_url == FALSE && template_hostgroup->have_notes_url == TRUE) {
-			if(this_hostgroup->notes_url == NULL && template_hostgroup->notes_url != NULL)
-				this_hostgroup->notes_url = (char *)strdup(template_hostgroup->notes_url);
-			this_hostgroup->have_notes_url = TRUE;
-			}
-		if(this_hostgroup->have_action_url == FALSE && template_hostgroup->have_action_url == TRUE) {
-			if(this_hostgroup->action_url == NULL && template_hostgroup->action_url != NULL)
-				this_hostgroup->action_url = (char *)strdup(template_hostgroup->action_url);
-			this_hostgroup->have_action_url = TRUE;
-			}
+		xod_inherit_str(this_hostgroup, template_hostgroup, notes);
+		xod_inherit_str(this_hostgroup, template_hostgroup, notes_url);
+		xod_inherit_str(this_hostgroup, template_hostgroup, action_url);
 		}
 
 	my_free(template_names);
@@ -5309,29 +5308,15 @@
 		xodtemplate_resolve_servicegroup(template_servicegroup);
 
 		/* apply missing properties from template servicegroup... */
-		if(this_servicegroup->servicegroup_name == NULL && template_servicegroup->servicegroup_name != NULL)
-			this_servicegroup->servicegroup_name = (char *)strdup(template_servicegroup->servicegroup_name);
-		if(this_servicegroup->alias == NULL && template_servicegroup->alias != NULL)
-			this_servicegroup->alias = (char *)strdup(template_servicegroup->alias);
+		xod_inherit_str_nohave(this_servicegroup, template_servicegroup, servicegroup_name);
+		xod_inherit_str_nohave(this_servicegroup, template_servicegroup, alias);
 
 		xodtemplate_get_inherited_string(&template_servicegroup->have_members, &template_servicegroup->members, &this_servicegroup->have_members, &this_servicegroup->members);
 		xodtemplate_get_inherited_string(&template_servicegroup->have_servicegroup_members, &template_servicegroup->servicegroup_members, &this_servicegroup->have_servicegroup_members, &this_servicegroup->servicegroup_members);
 
-		if(this_servicegroup->have_notes == FALSE && template_servicegroup->have_notes == TRUE) {
-			if(this_servicegroup->notes == NULL && template_servicegroup->notes != NULL)
-				this_servicegroup->notes = (char *)strdup(template_servicegroup->notes);
-			this_servicegroup->have_notes = TRUE;
-			}
-		if(this_servicegroup->have_notes_url == FALSE && template_servicegroup->have_notes_url == TRUE) {
-			if(this_servicegroup->notes_url == NULL && template_servicegroup->notes_url != NULL)
-				this_servicegroup->notes_url = (char *)strdup(template_servicegroup->notes_url);
-			this_servicegroup->have_notes_url = TRUE;
-			}
-		if(this_servicegroup->have_action_url == FALSE && template_servicegroup->have_action_url == TRUE) {
-			if(this_servicegroup->action_url == NULL && template_servicegroup->action_url != NULL)
-				this_servicegroup->action_url = (char *)strdup(template_servicegroup->action_url);
-			this_servicegroup->have_action_url = TRUE;
-			}
+		xod_inherit_str(this_servicegroup, template_servicegroup, notes);
+		xod_inherit_str(this_servicegroup, template_servicegroup, notes_url);
+		xod_inherit_str(this_servicegroup, template_servicegroup, action_url);
 		}
 
 	my_free(template_names);
@@ -5522,71 +5507,27 @@
 		xodtemplate_resolve_contact(template_contact);
 
 		/* apply missing properties from template contact... */
-		if(this_contact->contact_name == NULL && template_contact->contact_name != NULL)
-			this_contact->contact_name = (char *)strdup(template_contact->contact_name);
-		if(this_contact->alias == NULL && template_contact->alias != NULL)
-			this_contact->alias = (char *)strdup(template_contact->alias);
+		xod_inherit_str_nohave(this_contact, template_contact, contact_name);
+		xod_inherit_str_nohave(this_contact, template_contact, alias);
 
-		if(this_contact->have_email == FALSE && template_contact->have_email == TRUE) {
-			if(this_contact->email == NULL && template_contact->email != NULL)
-				this_contact->email = (char *)strdup(template_contact->email);
-			this_contact->have_email = TRUE;
-			}
-		if(this_contact->have_pager == FALSE && template_contact->have_pager == TRUE) {
-			if(this_contact->pager == NULL && template_contact->pager != NULL)
-				this_contact->pager = (char *)strdup(template_contact->pager);
-			this_contact->have_pager = TRUE;
-			}
-		for(x = 0; x < MAX_XODTEMPLATE_CONTACT_ADDRESSES; x++) {
-			if(this_contact->have_address[x] == FALSE && template_contact->have_address[x] == TRUE) {
-				if(this_contact->address[x] == NULL && template_contact->address[x] != NULL)
-					this_contact->address[x] = (char *)strdup(template_contact->address[x]);
-				this_contact->have_address[x] = TRUE;
-				}
-			}
+		xod_inherit_str(this_contact, template_contact, email);
+		xod_inherit_str(this_contact, template_contact, pager);
+		for(x = 0; x < MAX_XODTEMPLATE_CONTACT_ADDRESSES; x++)
+			xod_inherit_str(this_contact, template_contact, address[x]);
 
 		xodtemplate_get_inherited_string(&template_contact->have_contact_groups, &template_contact->contact_groups, &this_contact->have_contact_groups, &this_contact->contact_groups);
 		xodtemplate_get_inherited_string(&template_contact->have_host_notification_commands, &template_contact->host_notification_commands, &this_contact->have_host_notification_commands, &this_contact->host_notification_commands);
 		xodtemplate_get_inherited_string(&template_contact->have_service_notification_commands, &template_contact->service_notification_commands, &this_contact->have_service_notification_commands, &this_contact->service_notification_commands);
 
-		if(this_contact->have_host_notification_period == FALSE && template_contact->have_host_notification_period == TRUE) {
-			if(this_contact->host_notification_period == NULL && template_contact->host_notification_period != NULL)
-				this_contact->host_notification_period = (char *)strdup(template_contact->host_notification_period);
-			this_contact->have_host_notification_period = TRUE;
-			}
-		if(this_contact->have_service_notification_period == FALSE && template_contact->have_service_notification_period == TRUE) {
-			if(this_contact->service_notification_period == NULL && template_contact->service_notification_period != NULL)
-				this_contact->service_notification_period = (char *)strdup(template_contact->service_notification_period);
-			this_contact->have_service_notification_period = TRUE;
-			}
-		if(this_contact->have_host_notification_options == FALSE && template_contact->have_host_notification_options == TRUE) {
-			this_contact->host_notification_options = template_contact->host_notification_options;
-			this_contact->have_host_notification_options = TRUE;
-			}
-		if(this_contact->have_service_notification_options == FALSE && template_contact->have_service_notification_options == TRUE) {
-			this_contact->service_notification_options = template_contact->service_notification_options;
-			this_contact->have_service_notification_options = TRUE;
-			}
-		if(this_contact->have_host_notifications_enabled == FALSE && template_contact->have_host_notifications_enabled == TRUE) {
-			this_contact->host_notifications_enabled = template_contact->host_notifications_enabled;
-			this_contact->have_host_notifications_enabled = TRUE;
-			}
-		if(this_contact->have_service_notifications_enabled == FALSE && template_contact->have_service_notifications_enabled == TRUE) {
-			this_contact->service_notifications_enabled = template_contact->service_notifications_enabled;
-			this_contact->have_service_notifications_enabled = TRUE;
-			}
-		if(this_contact->have_can_submit_commands == FALSE && template_contact->have_can_submit_commands == TRUE) {
-			this_contact->can_submit_commands = template_contact->can_submit_commands;
-			this_contact->have_can_submit_commands = TRUE;
-			}
-		if(this_contact->have_retain_status_information == FALSE && template_contact->have_retain_status_information == TRUE) {
-			this_contact->retain_status_information = template_contact->retain_status_information;
-			this_contact->have_retain_status_information = TRUE;
-			}
-		if(this_contact->have_retain_nonstatus_information == FALSE && template_contact->have_retain_nonstatus_information == TRUE) {
-			this_contact->retain_nonstatus_information = template_contact->retain_nonstatus_information;
-			this_contact->have_retain_nonstatus_information = TRUE;
-			}
+		xod_inherit_str(this_contact, template_contact, host_notification_period);
+		xod_inherit_str(this_contact, template_contact, service_notification_period);
+		xod_inherit(this_contact, template_contact, host_notification_options);
+		xod_inherit(this_contact, template_contact, service_notification_options);
+		xod_inherit(this_contact, template_contact, host_notifications_enabled);
+		xod_inherit(this_contact, template_contact, service_notifications_enabled);
+		xod_inherit(this_contact, template_contact, can_submit_commands);
+		xod_inherit(this_contact, template_contact, retain_status_information);
+		xod_inherit(this_contact, template_contact, retain_nonstatus_information);
 
 		/* apply missing custom variables from template contact... */
 		for(temp_customvariablesmember = template_contact->custom_variables; temp_customvariablesmember != NULL; temp_customvariablesmember = temp_customvariablesmember->next) {
@@ -5648,158 +5589,49 @@
 		xodtemplate_resolve_host(template_host);
 
 		/* apply missing properties from template host... */
-		if(this_host->host_name == NULL && template_host->host_name != NULL)
-			this_host->host_name = (char *)strdup(template_host->host_name);
-		if(this_host->have_display_name == FALSE && template_host->have_display_name == TRUE) {
-			if(this_host->display_name == NULL && template_host->display_name != NULL)
-				this_host->display_name = (char *)strdup(template_host->display_name);
-			this_host->have_display_name = TRUE;
-			}
-		if(this_host->alias == NULL && template_host->alias != NULL)
-			this_host->alias = (char *)strdup(template_host->alias);
-		if(this_host->address == NULL && template_host->address != NULL)
-			this_host->address = (char *)strdup(template_host->address);
+		xod_inherit_str_nohave(this_host, template_host, host_name);
+		xod_inherit_str(this_host, template_host, display_name);
+		xod_inherit_str_nohave(this_host, template_host, alias);
+		xod_inherit_str_nohave(this_host, template_host, address);
 
 		xodtemplate_get_inherited_string(&template_host->have_parents, &template_host->parents, &this_host->have_parents, &this_host->parents);
 		xodtemplate_get_inherited_string(&template_host->have_host_groups, &template_host->host_groups, &this_host->have_host_groups, &this_host->host_groups);
 		xodtemplate_get_inherited_string(&template_host->have_contact_groups, &template_host->contact_groups, &this_host->have_contact_groups, &this_host->contact_groups);
 		xodtemplate_get_inherited_string(&template_host->have_contacts, &template_host->contacts, &this_host->have_contacts, &this_host->contacts);
 
-		if(this_host->have_check_command == FALSE && template_host->have_check_command == TRUE) {
-			if(this_host->check_command == NULL && template_host->check_command != NULL)
-				this_host->check_command = (char *)strdup(template_host->check_command);
-			this_host->have_check_command = TRUE;
-			}
-		if(this_host->have_check_period == FALSE && template_host->have_check_period == TRUE) {
-			if(this_host->check_period == NULL && template_host->check_period != NULL)
-				this_host->check_period = (char *)strdup(template_host->check_period);
-			this_host->have_check_period = TRUE;
-			}
-		if(this_host->have_event_handler == FALSE && template_host->have_event_handler == TRUE) {
-			if(this_host->event_handler == NULL && template_host->event_handler != NULL)
-				this_host->event_handler = (char *)strdup(template_host->event_handler);
-			this_host->have_event_handler = TRUE;
-			}
-		if(this_host->have_notification_period == FALSE && template_host->have_notification_period == TRUE) {
-			if(this_host->notification_period == NULL && template_host->notification_period != NULL)
-				this_host->notification_period = (char *)strdup(template_host->notification_period);
-			this_host->have_notification_period = TRUE;
-			}
-		if(this_host->have_notes == FALSE && template_host->have_notes == TRUE) {
-			if(this_host->notes == NULL && template_host->notes != NULL)
-				this_host->notes = (char *)strdup(template_host->notes);
-			this_host->have_notes = TRUE;
-			}
-		if(this_host->have_notes_url == FALSE && template_host->have_notes_url == TRUE) {
-			if(this_host->notes_url == NULL && template_host->notes_url != NULL)
-				this_host->notes_url = (char *)strdup(template_host->notes_url);
-			this_host->have_notes_url = TRUE;
-			}
-		if(this_host->have_action_url == FALSE && template_host->have_action_url == TRUE) {
-			if(this_host->action_url == NULL && template_host->action_url != NULL)
-				this_host->action_url = (char *)strdup(template_host->action_url);
-			this_host->have_action_url = TRUE;
-			}
-		if(this_host->have_icon_image == FALSE && template_host->have_icon_image == TRUE) {
-			if(this_host->icon_image == NULL && template_host->icon_image != NULL)
-				this_host->icon_image = (char *)strdup(template_host->icon_image);
-			this_host->have_icon_image = TRUE;
-			}
-		if(this_host->have_icon_image_alt == FALSE && template_host->have_icon_image_alt == TRUE) {
-			if(this_host->icon_image_alt == NULL && template_host->icon_image_alt != NULL)
-				this_host->icon_image_alt = (char *)strdup(template_host->icon_image_alt);
-			this_host->have_icon_image_alt = TRUE;
-			}
-		if(this_host->have_vrml_image == FALSE && template_host->have_vrml_image == TRUE) {
-			if(this_host->vrml_image == NULL && template_host->vrml_image != NULL)
-				this_host->vrml_image = (char *)strdup(template_host->vrml_image);
-			this_host->have_vrml_image = TRUE;
-			}
-		if(this_host->have_statusmap_image == FALSE && template_host->have_statusmap_image == TRUE) {
-			if(this_host->statusmap_image == NULL && template_host->statusmap_image != NULL)
-				this_host->statusmap_image = (char *)strdup(template_host->statusmap_image);
-			this_host->have_statusmap_image = TRUE;
-			}
-		if(this_host->have_initial_state == FALSE && template_host->have_initial_state == TRUE) {
-			this_host->initial_state = template_host->initial_state;
-			this_host->have_initial_state = TRUE;
-			}
-		if(this_host->have_check_interval == FALSE && template_host->have_check_interval == TRUE) {
-			this_host->check_interval = template_host->check_interval;
-			this_host->have_check_interval = TRUE;
-			}
-		if(this_host->have_retry_interval == FALSE && template_host->have_retry_interval == TRUE) {
-			this_host->retry_interval = template_host->retry_interval;
-			this_host->have_retry_interval = TRUE;
-			}
-		if(this_host->have_max_check_attempts == FALSE && template_host->have_max_check_attempts == TRUE) {
-			this_host->max_check_attempts = template_host->max_check_attempts;
-			this_host->have_max_check_attempts = TRUE;
-			}
-		if(this_host->have_active_checks_enabled == FALSE && template_host->have_active_checks_enabled == TRUE) {
-			this_host->active_checks_enabled = template_host->active_checks_enabled;
-			this_host->have_active_checks_enabled = TRUE;
-			}
-		if(this_host->have_passive_checks_enabled == FALSE && template_host->have_passive_checks_enabled == TRUE) {
-			this_host->passive_checks_enabled = template_host->passive_checks_enabled;
-			this_host->have_passive_checks_enabled = TRUE;
-			}
-		if(this_host->have_obsess == FALSE && template_host->have_obsess == TRUE) {
-			this_host->obsess = template_host->obsess;
-			this_host->have_obsess = TRUE;
-			}
-		if(this_host->have_event_handler_enabled == FALSE && template_host->have_event_handler_enabled == TRUE) {
-			this_host->event_handler_enabled = template_host->event_handler_enabled;
-			this_host->have_event_handler_enabled = TRUE;
-			}
-		if(this_host->have_check_freshness == FALSE && template_host->have_check_freshness == TRUE) {
-			this_host->check_freshness = template_host->check_freshness;
-			this_host->have_check_freshness = TRUE;
-			}
-		if(this_host->have_freshness_threshold == FALSE && template_host->have_freshness_threshold == TRUE) {
-			this_host->freshness_threshold = template_host->freshness_threshold;
-			this_host->have_freshness_threshold = TRUE;
-			}
-		if(this_host->have_low_flap_threshold == FALSE && template_host->have_low_flap_threshold == TRUE) {
-			this_host->low_flap_threshold = template_host->low_flap_threshold;
-			this_host->have_low_flap_threshold = TRUE;
-			}
-		if(this_host->have_high_flap_threshold == FALSE && template_host->have_high_flap_threshold == TRUE) {
-			this_host->high_flap_threshold = template_host->high_flap_threshold;
-			this_host->have_high_flap_threshold = TRUE;
-			}
-		if(this_host->have_flap_detection_enabled == FALSE && template_host->have_flap_detection_enabled == TRUE) {
-			this_host->flap_detection_enabled = template_host->flap_detection_enabled;
-			this_host->have_flap_detection_enabled = TRUE;
-			}
-		if(this_host->have_flap_detection_options == FALSE && template_host->have_flap_detection_options == TRUE) {
-			this_host->flap_detection_options = template_host->flap_detection_options;
-			this_host->have_flap_detection_options = TRUE;
-			}
-		if(this_host->have_notification_options == FALSE && template_host->have_notification_options == TRUE) {
-			this_host->notification_options = template_host->notification_options;
-			this_host->have_notification_options = TRUE;
-			}
-		if(this_host->have_notifications_enabled == FALSE && template_host->have_notifications_enabled == TRUE) {
-			this_host->notifications_enabled = template_host->notifications_enabled;
-			this_host->have_notifications_enabled = TRUE;
-			}
-		if(this_host->have_notification_interval == FALSE && template_host->have_notification_interval == TRUE) {
-			this_host->notification_interval = template_host->notification_interval;
-			this_host->have_notification_interval = TRUE;
-			}
-		if(this_host->have_first_notification_delay == FALSE && template_host->have_first_notification_delay == TRUE) {
-			this_host->first_notification_delay = template_host->first_notification_delay;
-			this_host->have_first_notification_delay = TRUE;
-			}
-		if(this_host->have_stalking_options == FALSE && template_host->have_stalking_options == TRUE) {
-			this_host->stalking_options = template_host->stalking_options;
-			this_host->have_stalking_options = TRUE;
-			}
-		if(this_host->have_process_perf_data == FALSE && template_host->have_process_perf_data == TRUE) {
-			this_host->process_perf_data = template_host->process_perf_data;
-			this_host->have_process_perf_data = TRUE;
-			}
+		xod_inherit_str(this_host, template_host, check_command);
+		xod_inherit_str(this_host, template_host, check_period);
+		xod_inherit_str(this_host, template_host, event_handler);
+		xod_inherit_str(this_host, template_host, notification_period);
+		xod_inherit_str(this_host, template_host, notes);
+		xod_inherit_str(this_host, template_host, notes_url);
+		xod_inherit_str(this_host, template_host, action_url);
+		xod_inherit_str(this_host, template_host, icon_image);
+		xod_inherit_str(this_host, template_host, icon_image_alt);
+		xod_inherit_str(this_host, template_host, vrml_image);
+		xod_inherit_str(this_host, template_host, statusmap_image);
+
+		xod_inherit(this_host, template_host, initial_state);
+		xod_inherit(this_host, template_host, check_interval);
+		xod_inherit(this_host, template_host, retry_interval);
+		xod_inherit(this_host, template_host, max_check_attempts);
+		xod_inherit(this_host, template_host, active_checks_enabled);
+		xod_inherit(this_host, template_host, passive_checks_enabled);
+		xod_inherit(this_host, template_host, obsess);
+		xod_inherit(this_host, template_host, event_handler_enabled);
+		xod_inherit(this_host, template_host, check_freshness);
+		xod_inherit(this_host, template_host, freshness_threshold);
+		xod_inherit(this_host, template_host, low_flap_threshold);
+		xod_inherit(this_host, template_host, high_flap_threshold);
+		xod_inherit(this_host, template_host, flap_detection_enabled);
+		xod_inherit(this_host, template_host, flap_detection_options);
+		xod_inherit(this_host, template_host, notification_options);
+		xod_inherit(this_host, template_host, notifications_enabled);
+		xod_inherit(this_host, template_host, notification_interval);
+		xod_inherit(this_host, template_host, first_notification_delay);
+		xod_inherit(this_host, template_host, stalking_options);
+		xod_inherit(this_host, template_host, process_perf_data);
+
 		if(this_host->have_2d_coords == FALSE && template_host->have_2d_coords == TRUE) {
 			this_host->x_2d = template_host->x_2d;
 			this_host->y_2d = template_host->y_2d;
@@ -5811,15 +5643,10 @@
 			this_host->z_3d = template_host->z_3d;
 			this_host->have_3d_coords = TRUE;
 			}
-		if(this_host->have_retain_status_information == FALSE && template_host->have_retain_status_information == TRUE) {
-			this_host->retain_status_information = template_host->retain_status_information;
-			this_host->have_retain_status_information = TRUE;
-			}
-		if(this_host->have_retain_nonstatus_information == FALSE && template_host->have_retain_nonstatus_information == TRUE) {
-			this_host->retain_nonstatus_information = template_host->retain_nonstatus_information;
-			this_host->have_retain_nonstatus_information = TRUE;
-			}
 
+		xod_inherit(this_host, template_host, retain_status_information);
+		xod_inherit(this_host, template_host, retain_nonstatus_information);
+
 		/* apply missing custom variables from template host... */
 		for(temp_customvariablesmember = template_host->custom_variables; temp_customvariablesmember != NULL; temp_customvariablesmember = temp_customvariablesmember->next) {
 
@@ -5880,16 +5707,8 @@
 		xodtemplate_resolve_service(template_service);
 
 		/* apply missing properties from template service... */
-		if(this_service->have_service_description == FALSE && template_service->have_service_description == TRUE) {
-			if(this_service->service_description == NULL && template_service->service_description != NULL)
-				this_service->service_description = (char *)strdup(template_service->service_description);
-			this_service->have_service_description = TRUE;
-			}
-		if(this_service->have_display_name == FALSE && template_service->have_display_name == TRUE) {
-			if(this_service->display_name == NULL && template_service->display_name != NULL)
-				this_service->display_name = (char *)strdup(template_service->display_name);
-			this_service->have_display_name = TRUE;
-			}
+		xod_inherit_str(this_service, template_service, service_description);
+		xod_inherit_str(this_service, template_service, display_name);
 
 		xodtemplate_get_inherited_string(&template_service->have_parents, &template_service->parents, &this_service->have_parents, &this_service->parents);
 		xodtemplate_get_inherited_string(&template_service->have_host_name, &template_service->host_name, &this_service->have_host_name, &this_service->host_name);
@@ -5903,149 +5722,43 @@
 				my_free(this_service->check_command);
 				this_service->have_check_command = FALSE;
 				}
-			if(this_service->have_check_command == FALSE) {
-				if(this_service->check_command == NULL && template_service->check_command != NULL)
-					this_service->check_command = (char *)strdup(template_service->check_command);
-				this_service->have_check_command = TRUE;
-				}
 			}
-		if(this_service->have_check_period == FALSE && template_service->have_check_period == TRUE) {
-			if(this_service->check_period == NULL && template_service->check_period != NULL)
-				this_service->check_period = (char *)strdup(template_service->check_period);
-			this_service->have_check_period = TRUE;
-			}
-		if(this_service->have_event_handler == FALSE && template_service->have_event_handler == TRUE) {
-			if(this_service->event_handler == NULL && template_service->event_handler != NULL)
-				this_service->event_handler = (char *)strdup(template_service->event_handler);
-			this_service->have_event_handler = TRUE;
-			}
-		if(this_service->have_notification_period == FALSE && template_service->have_notification_period == TRUE) {
-			if(this_service->notification_period == NULL && template_service->notification_period != NULL)
-				this_service->notification_period = (char *)strdup(template_service->notification_period);
-			this_service->have_notification_period = TRUE;
-			}
-		if(this_service->have_notes == FALSE && template_service->have_notes == TRUE) {
-			if(this_service->notes == NULL && template_service->notes != NULL)
-				this_service->notes = (char *)strdup(template_service->notes);
-			this_service->have_notes = TRUE;
-			}
-		if(this_service->have_notes_url == FALSE && template_service->have_notes_url == TRUE) {
-			if(this_service->notes_url == NULL && template_service->notes_url != NULL)
-				this_service->notes_url = (char *)strdup(template_service->notes_url);
-			this_service->have_notes_url = TRUE;
-			}
-		if(this_service->have_action_url == FALSE && template_service->have_action_url == TRUE) {
-			if(this_service->action_url == NULL && template_service->action_url != NULL)
-				this_service->action_url = (char *)strdup(template_service->action_url);
-			this_service->have_action_url = TRUE;
-			}
-		if(this_service->have_icon_image == FALSE && template_service->have_icon_image == TRUE) {
-			if(this_service->icon_image == NULL && template_service->icon_image != NULL)
-				this_service->icon_image = (char *)strdup(template_service->icon_image);
-			this_service->have_icon_image = TRUE;
-			}
-		if(this_service->have_icon_image_alt == FALSE && template_service->have_icon_image_alt == TRUE) {
-			if(this_service->icon_image_alt == NULL && template_service->icon_image_alt != NULL)
-				this_service->icon_image_alt = (char *)strdup(template_service->icon_image_alt);
-			this_service->have_icon_image_alt = TRUE;
-			}
-		if(this_service->have_initial_state == FALSE && template_service->have_initial_state == TRUE) {
-			this_service->initial_state = template_service->initial_state;
-			this_service->have_initial_state = TRUE;
-			}
-		if(this_service->have_max_check_attempts == FALSE && template_service->have_max_check_attempts == TRUE) {
-			this_service->max_check_attempts = template_service->max_check_attempts;
-			this_service->have_max_check_attempts = TRUE;
-			}
-		if(this_service->have_check_interval == FALSE && template_service->have_check_interval == TRUE) {
-			this_service->check_interval = template_service->check_interval;
-			this_service->have_check_interval = TRUE;
-			}
-		if(this_service->have_retry_interval == FALSE && template_service->have_retry_interval == TRUE) {
-			this_service->retry_interval = template_service->retry_interval;
-			this_service->have_retry_interval = TRUE;
-			}
-		if(this_service->have_active_checks_enabled == FALSE && template_service->have_active_checks_enabled == TRUE) {
-			this_service->active_checks_enabled = template_service->active_checks_enabled;
-			this_service->have_active_checks_enabled = TRUE;
-			}
-		if(this_service->have_passive_checks_enabled == FALSE && template_service->have_passive_checks_enabled == TRUE) {
-			this_service->passive_checks_enabled = template_service->passive_checks_enabled;
-			this_service->have_passive_checks_enabled = TRUE;
-			}
-		if(this_service->have_parallelize_check == FALSE && template_service->have_parallelize_check == TRUE) {
-			this_service->parallelize_check = template_service->parallelize_check;
-			this_service->have_parallelize_check = TRUE;
-			}
-		if(this_service->have_is_volatile == FALSE && template_service->have_is_volatile == TRUE) {
-			this_service->is_volatile = template_service->is_volatile;
-			this_service->have_is_volatile = TRUE;
-			}
-		if(this_service->have_obsess == FALSE && template_service->have_obsess == TRUE) {
-			this_service->obsess = template_service->obsess;
-			this_service->have_obsess = TRUE;
-			}
-		if(this_service->have_event_handler_enabled == FALSE && template_service->have_event_handler_enabled == TRUE) {
-			this_service->event_handler_enabled = template_service->event_handler_enabled;
-			this_service->have_event_handler_enabled = TRUE;
-			}
-		if(this_service->have_check_freshness == FALSE && template_service->have_check_freshness == TRUE) {
-			this_service->check_freshness = template_service->check_freshness;
-			this_service->have_check_freshness = TRUE;
-			}
-		if(this_service->have_freshness_threshold == FALSE && template_service->have_freshness_threshold == TRUE) {
-			this_service->freshness_threshold = template_service->freshness_threshold;
-			this_service->have_freshness_threshold = TRUE;
-			}
-		if(this_service->have_low_flap_threshold == FALSE && template_service->have_low_flap_threshold == TRUE) {
-			this_service->low_flap_threshold = template_service->low_flap_threshold;
-			this_service->have_low_flap_threshold = TRUE;
-			}
-		if(this_service->have_high_flap_threshold == FALSE && template_service->have_high_flap_threshold == TRUE) {
-			this_service->high_flap_threshold = template_service->high_flap_threshold;
-			this_service->have_high_flap_threshold = TRUE;
-			}
-		if(this_service->have_flap_detection_enabled == FALSE && template_service->have_flap_detection_enabled == TRUE) {
-			this_service->flap_detection_enabled = template_service->flap_detection_enabled;
-			this_service->have_flap_detection_enabled = TRUE;
-			}
-		if(this_service->have_flap_detection_options == FALSE && template_service->have_flap_detection_options == TRUE) {
-			this_service->flap_detection_options = template_service->flap_detection_options;
-			this_service->have_flap_detection_options = TRUE;
-			}
-		if(this_service->have_notification_options == FALSE && template_service->have_notification_options == TRUE) {
-			this_service->notification_options = template_service->notification_options;
-			this_service->have_notification_options = TRUE;
-			}
-		if(this_service->have_notifications_enabled == FALSE && template_service->have_notifications_enabled == TRUE) {
-			this_service->notifications_enabled = template_service->notifications_enabled;
-			this_service->have_notifications_enabled = TRUE;
-			}
-		if(this_service->have_notification_interval == FALSE && template_service->have_notification_interval == TRUE) {
-			this_service->notification_interval = template_service->notification_interval;
-			this_service->have_notification_interval = TRUE;
-			}
-		if(this_service->have_first_notification_delay == FALSE && template_service->have_first_notification_delay == TRUE) {
-			this_service->first_notification_delay = template_service->first_notification_delay;
-			this_service->have_first_notification_delay = TRUE;
-			}
-		if(this_service->have_stalking_options == FALSE && template_service->have_stalking_options == TRUE) {
-			this_service->stalking_options = template_service->stalking_options;
-			this_service->have_stalking_options = TRUE;
-			}
-		if(this_service->have_process_perf_data == FALSE && template_service->have_process_perf_data == TRUE) {
-			this_service->process_perf_data = template_service->process_perf_data;
-			this_service->have_process_perf_data = TRUE;
-			}
-		if(this_service->have_retain_status_information == FALSE && template_service->have_retain_status_information == TRUE) {
-			this_service->retain_status_information = template_service->retain_status_information;
-			this_service->have_retain_status_information = TRUE;
-			}
-		if(this_service->have_retain_nonstatus_information == FALSE && template_service->have_retain_nonstatus_information == TRUE) {
-			this_service->retain_nonstatus_information = template_service->retain_nonstatus_information;
-			this_service->have_retain_nonstatus_information = TRUE;
-			}
+		xod_inherit_str(this_service, template_service, check_command);
 
+		xod_inherit_str(this_service, template_service, check_period);
+		xod_inherit_str(this_service, template_service, event_handler);
+		xod_inherit_str(this_service, template_service, notification_period);
+		xod_inherit_str(this_service, template_service, notes);
+		xod_inherit_str(this_service, template_service, notes_url);
+		xod_inherit_str(this_service, template_service, action_url);
+		xod_inherit_str(this_service, template_service, icon_image);
+		xod_inherit_str(this_service, template_service, icon_image_alt);
+
+		xod_inherit(this_service, template_service, initial_state);
+		xod_inherit(this_service, template_service, max_check_attempts);
+		xod_inherit(this_service, template_service, check_interval);
+		xod_inherit(this_service, template_service, retry_interval);
+		xod_inherit(this_service, template_service, active_checks_enabled);
+		xod_inherit(this_service, template_service, passive_checks_enabled);
+		xod_inherit(this_service, template_service, parallelize_check);
+		xod_inherit(this_service, template_service, is_volatile);
+		xod_inherit(this_service, template_service, obsess);
+		xod_inherit(this_service, template_service, event_handler_enabled);
+		xod_inherit(this_service, template_service, check_freshness);
+		xod_inherit(this_service, template_service, freshness_threshold);
+		xod_inherit(this_service, template_service, low_flap_threshold);
+		xod_inherit(this_service, template_service, high_flap_threshold);
+		xod_inherit(this_service, template_service, flap_detection_enabled);
+		xod_inherit(this_service, template_service, flap_detection_options);
+		xod_inherit(this_service, template_service, notification_options);
+		xod_inherit(this_service, template_service, notifications_enabled);
+		xod_inherit(this_service, template_service, notification_interval);
+		xod_inherit(this_service, template_service, first_notification_delay);
+		xod_inherit(this_service, template_service, stalking_options);
+		xod_inherit(this_service, template_service, process_perf_data);
+		xod_inherit(this_service, template_service, retain_status_information);
+		xod_inherit(this_service, template_service, retain_nonstatus_information);
+
 		/* apply missing custom variables from template service... */
 		for(temp_customvariablesmember = template_service->custom_variables; temp_customvariablesmember != NULL; temp_customvariablesmember = temp_customvariablesmember->next) {
 
@@ -6109,23 +5822,10 @@
 		xodtemplate_get_inherited_string(&template_hostdependency->have_hostgroup_name, &template_hostdependency->hostgroup_name, &this_hostdependency->have_hostgroup_name, &this_hostdependency->hostgroup_name);
 		xodtemplate_get_inherited_string(&template_hostdependency->have_dependent_hostgroup_name, &template_hostdependency->dependent_hostgroup_name, &this_hostdependency->have_dependent_hostgroup_name, &this_hostdependency->dependent_hostgroup_name);
 
-		if(this_hostdependency->have_execution_failure_options == FALSE && template_hostdependency->have_execution_failure_options == TRUE) {
-			this_hostdependency->execution_failure_options = template_hostdependency->execution_failure_options;
-			this_hostdependency->have_execution_failure_options = TRUE;
-		if(this_hostdependency->have_dependency_period == FALSE && template_hostdependency->have_dependency_period == TRUE) {
-			if(this_hostdependency->dependency_period == NULL && template_hostdependency->dependency_period != NULL)
-				this_hostdependency->dependency_period = (char *)strdup(template_hostdependency->dependency_period);
-			this_hostdependency->have_dependency_period = TRUE;
-			}
-		if(this_hostdependency->have_inherits_parent == FALSE && template_hostdependency->have_inherits_parent == TRUE) {
-			this_hostdependency->inherits_parent = template_hostdependency->inherits_parent;
-			this_hostdependency->have_inherits_parent = TRUE;
-			}
-			}
-		if(this_hostdependency->have_notification_failure_options == FALSE && template_hostdependency->have_notification_failure_options == TRUE) {
-			this_hostdependency->notification_failure_options = template_hostdependency->notification_failure_options;
-			this_hostdependency->have_notification_failure_options = TRUE;
-			}
+		xod_inherit_str(this_hostdependency, template_hostdependency, dependency_period);
+		xod_inherit(this_hostdependency, template_hostdependency, inherits_parent);
+		xod_inherit(this_hostdependency, template_hostdependency, execution_failure_options);
+		xod_inherit(this_hostdependency, template_hostdependency, notification_failure_options);
 		}
 
 	my_free(template_names);
@@ -6175,27 +5875,11 @@
 		xodtemplate_get_inherited_string(&template_hostescalation->have_contact_groups, &template_hostescalation->contact_groups, &this_hostescalation->have_contact_groups, &this_hostescalation->contact_groups);
 		xodtemplate_get_inherited_string(&template_hostescalation->have_contacts, &template_hostescalation->contacts, &this_hostescalation->have_contacts, &this_hostescalation->contacts);
 
-		if(this_hostescalation->have_escalation_period == FALSE && template_hostescalation->have_escalation_period == TRUE) {
-			if(this_hostescalation->escalation_period == NULL && template_hostescalation->escalation_period != NULL)
-				this_hostescalation->escalation_period = (char *)strdup(template_hostescalation->escalation_period);
-			this_hostescalation->have_escalation_period = TRUE;
-			}
-		if(this_hostescalation->have_first_notification == FALSE && template_hostescalation->have_first_notification == TRUE) {
-			this_hostescalation->first_notification = template_hostescalation->first_notification;
-			this_hostescalation->have_first_notification = TRUE;
-			}
-		if(this_hostescalation->have_last_notification == FALSE && template_hostescalation->have_last_notification == TRUE) {
-			this_hostescalation->last_notification = template_hostescalation->last_notification;
-			this_hostescalation->have_last_notification = TRUE;
-			}
-		if(this_hostescalation->have_notification_interval == FALSE && template_hostescalation->have_notification_interval == TRUE) {
-			this_hostescalation->notification_interval = template_hostescalation->notification_interval;
-			this_hostescalation->have_notification_interval = TRUE;
-			}
-		if(this_hostescalation->have_escalation_options == FALSE && template_hostescalation->have_escalation_options == TRUE) {
-			this_hostescalation->escalation_options = template_hostescalation->escalation_options;
-			this_hostescalation->have_escalation_options = TRUE;
-			}
+		xod_inherit_str(this_hostescalation, template_hostescalation, escalation_period);
+		xod_inherit(this_hostescalation, template_hostescalation, first_notification);
+		xod_inherit(this_hostescalation, template_hostescalation, last_notification);
+		xod_inherit(this_hostescalation, template_hostescalation, notification_interval);
+		xod_inherit(this_hostescalation, template_hostescalation, escalation_options);
 		}
 
 	my_free(template_names);
@@ -6241,51 +5925,16 @@
 		xodtemplate_resolve_hostextinfo(template_hostextinfo);
 
 		/* apply missing properties from template hostextinfo... */
-		if(this_hostextinfo->have_host_name == FALSE && template_hostextinfo->have_host_name == TRUE) {
-			if(this_hostextinfo->host_name == NULL && template_hostextinfo->host_name != NULL)
-				this_hostextinfo->host_name = (char *)strdup(template_hostextinfo->host_name);
-			this_hostextinfo->have_host_name = TRUE;
-			}
-		if(this_hostextinfo->have_hostgroup_name == FALSE && template_hostextinfo->have_hostgroup_name == TRUE) {
-			if(this_hostextinfo->hostgroup_name == NULL && template_hostextinfo->hostgroup_name != NULL)
-				this_hostextinfo->hostgroup_name = (char *)strdup(template_hostextinfo->hostgroup_name);
-			this_hostextinfo->have_hostgroup_name = TRUE;
-			}
-		if(this_hostextinfo->have_notes == FALSE && template_hostextinfo->have_notes == TRUE) {
-			if(this_hostextinfo->notes == NULL && template_hostextinfo->notes != NULL)
-				this_hostextinfo->notes = (char *)strdup(template_hostextinfo->notes);
-			this_hostextinfo->have_notes = TRUE;
-			}
-		if(this_hostextinfo->have_notes_url == FALSE && template_hostextinfo->have_notes_url == TRUE) {
-			if(this_hostextinfo->notes_url == NULL && template_hostextinfo->notes_url != NULL)
-				this_hostextinfo->notes_url = (char *)strdup(template_hostextinfo->notes_url);
-			this_hostextinfo->have_notes_url = TRUE;
-			}
-		if(this_hostextinfo->have_action_url == FALSE && template_hostextinfo->have_action_url == TRUE) {
-			if(this_hostextinfo->action_url == NULL && template_hostextinfo->action_url != NULL)
-				this_hostextinfo->action_url = (char *)strdup(template_hostextinfo->action_url);
-			this_hostextinfo->have_action_url = TRUE;
-			}
-		if(this_hostextinfo->have_icon_image == FALSE && template_hostextinfo->have_icon_image == TRUE) {
-			if(this_hostextinfo->icon_image == NULL && template_hostextinfo->icon_image != NULL)
-				this_hostextinfo->icon_image = (char *)strdup(template_hostextinfo->icon_image);
-			this_hostextinfo->have_icon_image = TRUE;
-			}
-		if(this_hostextinfo->have_icon_image_alt == FALSE && template_hostextinfo->have_icon_image_alt == TRUE) {
-			if(this_hostextinfo->icon_image_alt == NULL && template_hostextinfo->icon_image_alt != NULL)
-				this_hostextinfo->icon_image_alt = (char *)strdup(template_hostextinfo->icon_image_alt);
-			this_hostextinfo->have_icon_image_alt = TRUE;
-			}
-		if(this_hostextinfo->have_vrml_image == FALSE && template_hostextinfo->have_vrml_image == TRUE) {
-			if(this_hostextinfo->vrml_image == NULL && template_hostextinfo->vrml_image != NULL)
-				this_hostextinfo->vrml_image = (char *)strdup(template_hostextinfo->vrml_image);
-			this_hostextinfo->have_vrml_image = TRUE;
-			}
-		if(this_hostextinfo->have_statusmap_image == FALSE && template_hostextinfo->have_statusmap_image == TRUE) {
-			if(this_hostextinfo->statusmap_image == NULL && template_hostextinfo->statusmap_image != NULL)
-				this_hostextinfo->statusmap_image = (char *)strdup(template_hostextinfo->statusmap_image);
-			this_hostextinfo->have_statusmap_image = TRUE;
-			}
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, host_name);
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, hostgroup_name);
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, notes);
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, notes_url);
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, action_url);
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, icon_image);
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, icon_image_alt);
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, vrml_image);
+		xod_inherit_str(this_hostextinfo, template_hostextinfo, statusmap_image);
+
 		if(this_hostextinfo->have_2d_coords == FALSE && template_hostextinfo->have_2d_coords == TRUE) {
 			this_hostextinfo->x_2d = template_hostextinfo->x_2d;
 			this_hostextinfo->y_2d = template_hostextinfo->y_2d;
@@ -6342,46 +5991,14 @@
 		xodtemplate_resolve_serviceextinfo(template_serviceextinfo);
 
 		/* apply missing properties from template serviceextinfo... */
-		if(this_serviceextinfo->have_host_name == FALSE && template_serviceextinfo->have_host_name == TRUE) {
-			if(this_serviceextinfo->host_name == NULL && template_serviceextinfo->host_name != NULL)
-				this_serviceextinfo->host_name = (char *)strdup(template_serviceextinfo->host_name);
-			this_serviceextinfo->have_host_name = TRUE;
-			}
-		if(this_serviceextinfo->have_hostgroup_name == FALSE && template_serviceextinfo->have_hostgroup_name == TRUE) {
-			if(this_serviceextinfo->hostgroup_name == NULL && template_serviceextinfo->hostgroup_name != NULL)
-				this_serviceextinfo->hostgroup_name = (char *)strdup(template_serviceextinfo->hostgroup_name);
-			this_serviceextinfo->have_hostgroup_name = TRUE;
-			}
-		if(this_serviceextinfo->have_service_description == FALSE && template_serviceextinfo->have_service_description == TRUE) {
-			if(this_serviceextinfo->service_description == NULL && template_serviceextinfo->service_description != NULL)
-				this_serviceextinfo->service_description = (char *)strdup(template_serviceextinfo->service_description);
-			this_serviceextinfo->have_service_description = TRUE;
-			}
-		if(this_serviceextinfo->have_notes == FALSE && template_serviceextinfo->have_notes == TRUE) {
-			if(this_serviceextinfo->notes == NULL && template_serviceextinfo->notes != NULL)
-				this_serviceextinfo->notes = (char *)strdup(template_serviceextinfo->notes);
-			this_serviceextinfo->have_notes = TRUE;
-			}
-		if(this_serviceextinfo->have_notes_url == FALSE && template_serviceextinfo->have_notes_url == TRUE) {
-			if(this_serviceextinfo->notes_url == NULL && template_serviceextinfo->notes_url != NULL)
-				this_serviceextinfo->notes_url = (char *)strdup(template_serviceextinfo->notes_url);
-			this_serviceextinfo->have_notes_url = TRUE;
-			}
-		if(this_serviceextinfo->have_action_url == FALSE && template_serviceextinfo->have_action_url == TRUE) {
-			if(this_serviceextinfo->action_url == NULL && template_serviceextinfo->action_url != NULL)
-				this_serviceextinfo->action_url = (char *)strdup(template_serviceextinfo->action_url);
-			this_serviceextinfo->have_action_url = TRUE;
-			}
-		if(this_serviceextinfo->have_icon_image == FALSE && template_serviceextinfo->have_icon_image == TRUE) {
-			if(this_serviceextinfo->icon_image == NULL && template_serviceextinfo->icon_image != NULL)
-				this_serviceextinfo->icon_image = (char *)strdup(template_serviceextinfo->icon_image);
-			this_serviceextinfo->have_icon_image = TRUE;
-			}
-		if(this_serviceextinfo->have_icon_image_alt == FALSE && template_serviceextinfo->have_icon_image_alt == TRUE) {
-			if(this_serviceextinfo->icon_image_alt == NULL && template_serviceextinfo->icon_image_alt != NULL)
-				this_serviceextinfo->icon_image_alt = (char *)strdup(template_serviceextinfo->icon_image_alt);
-			this_serviceextinfo->have_icon_image_alt = TRUE;
-			}
+		xod_inherit_str(this_serviceextinfo, template_serviceextinfo, host_name);
+		xod_inherit_str(this_serviceextinfo, template_serviceextinfo, hostgroup_name);
+		xod_inherit_str(this_serviceextinfo, template_serviceextinfo, service_description);
+		xod_inherit_str(this_serviceextinfo, template_serviceextinfo, notes);
+		xod_inherit_str(this_serviceextinfo, template_serviceextinfo, notes_url);
+		xod_inherit_str(this_serviceextinfo, template_serviceextinfo, action_url);
+		xod_inherit_str(this_serviceextinfo, template_serviceextinfo, icon_image);
+		xod_inherit_str(this_serviceextinfo, template_serviceextinfo, icon_image_alt);
 		}
 
 	my_free(template_names);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2244
          http://nagios.svn.sourceforge.net/nagios/?rev=2244&view=rev
Author:   ageric
Date:     2012-09-18 05:23:31 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
xod: Fix contact inheritance

According to the docs, contacts should only be inherited from host to
service if the service has no other contacts what so ever (and the
same goes for escalations), but the way the code worked was that it
handled contact_groups and contacts directives separately, meaning
services with only 'contacts' specified were still eligible for
inheriting 'contact_groups' from the host, leading to much confusion.

This patch fixes that, and thereby issue 314.

While we're at it, we re-organize the inheritance macros a bit and
make sure to use them for cross-object inheritance too.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-09-18 05:00:14 UTC (rev 2243)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-09-18 05:23:31 UTC (rev 2244)
@@ -122,6 +122,37 @@
 #endif
 static bitmap *service_map, *parent_map;
 
+
+/*
+ * simple inheritance macros. o = object, t = template, v = variable
+ * Note that these can be used for inter-object inheritance as well,
+ * so long as the variable names are identical.
+ */
+#define xod_inherit(o, t, v) \
+	do { \
+		if(o->have_##v == FALSE && t->have_##v == TRUE) { \
+			o->v = t->v; \
+			o->have_##v = TRUE; \
+		} \
+	} while(0)
+
+#define xod_inherit_str_nohave(o, t, v) \
+	do { \
+		if(o->v == NULL && t->v != NULL) { \
+			o->v = (char *)strdup(t->v); \
+		} \
+	} while(0)
+
+#define xod_inherit_str(o, t, v) \
+	do { \
+		if(o->have_##v == FALSE && t->have_##v == TRUE) { \
+			xod_inherit_str_nohave(o, t, v); \
+			o->have_##v = TRUE; \
+		} \
+	} while(0)
+
+
+
 /* returns the name of a numbered config file */
 static char *xodtemplate_config_file_name(int config_file) {
 	if(config_file <= xodtemplate_current_config_file)
@@ -4568,29 +4599,20 @@
 		if((temp_host = xodtemplate_find_real_host(temp_service->host_name)) == NULL)
 			continue;
 
-		/* services inherit contact groups from host if not already specified */
-		if(temp_service->have_contact_groups == FALSE && temp_host->have_contact_groups == TRUE && temp_host->contact_groups != NULL) {
-			temp_service->contact_groups = (char *)strdup(temp_host->contact_groups);
-			temp_service->have_contact_groups = TRUE;
+		/*
+		 * if the service has no contacts specified, it will inherit
+		 * them from the host
+		 */
+		if(temp_service->have_contact_groups == FALSE && temp_service->have_contacts == FALSE) {
+			xod_inherit_str(temp_service, temp_host, contact_groups);
+			xod_inherit_str(temp_service, temp_host, contacts);
 			}
 
-		/* services inherit contacts from host if not already specified */
-		if(temp_service->have_contacts == FALSE && temp_host->have_contacts == TRUE && temp_host->contacts != NULL) {
-			temp_service->contacts = (char *)strdup(temp_host->contacts);
-			temp_service->have_contacts = TRUE;
-			}
-
 		/* services inherit notification interval from host if not already specified */
-		if(temp_service->have_notification_interval == FALSE && temp_host->have_notification_interval == TRUE) {
-			temp_service->notification_interval = temp_host->notification_interval;
-			temp_service->have_notification_interval = TRUE;
-			}
+		xod_inherit(temp_service, temp_host, notification_interval);
 
 		/* services inherit notification period from host if not already specified */
-		if(temp_service->have_notification_period == FALSE && temp_host->have_notification_period == TRUE && temp_host->notification_period != NULL) {
-			temp_service->notification_period = (char *)strdup(temp_host->notification_period);
-			temp_service->have_notification_period = TRUE;
-			}
+		xod_inherit_str(temp_service, temp_host, notification_period);
 
 		/* if notification options are missing, assume all */
 		if(temp_service->have_notification_options == FALSE) {
@@ -4606,32 +4628,23 @@
 		if((temp_service = xodtemplate_find_real_service(temp_serviceescalation->host_name, temp_serviceescalation->service_description)) == NULL)
 			continue;
 
-		/* service escalations inherit contact groups from service if not already specified */
-		if(temp_serviceescalation->have_contact_groups == FALSE && temp_service->have_contact_groups == TRUE && temp_service->contact_groups != NULL) {
-			temp_serviceescalation->contact_groups = (char *)strdup(temp_service->contact_groups);
-			temp_serviceescalation->have_contact_groups = TRUE;
-			}
-
 		/* SPECIAL RULE 10/04/07 - additive inheritance from service's contactgroup(s) */
 		if(temp_serviceescalation->contact_groups != NULL && temp_serviceescalation->contact_groups[0] == '+')
 			xodtemplate_get_inherited_string(&temp_service->have_contact_groups, &temp_service->contact_groups, &temp_serviceescalation->have_contact_groups, &temp_serviceescalation->contact_groups);
 
-		/* service escalations inherit contacts from service if not already specified */
-		if(temp_serviceescalation->have_contacts == FALSE && temp_service->have_contacts == TRUE && temp_service->contacts != NULL) {
-			temp_serviceescalation->contacts = (char *)strdup(temp_service->contacts);
-			temp_serviceescalation->have_contacts = TRUE;
-			}
-
 		/* SPECIAL RULE 10/04/07 - additive inheritance from service's contact(s) */
 		if(temp_serviceescalation->contacts != NULL && temp_serviceescalation->contacts[0] == '+')
 			xodtemplate_get_inherited_string(&temp_service->have_contacts, &temp_service->contacts, &temp_serviceescalation->have_contacts, &temp_serviceescalation->contacts);
 
-		/* service escalations inherit notification interval from service if not already defined */
-		if(temp_serviceescalation->have_notification_interval == FALSE && temp_service->have_notification_interval == TRUE) {
-			temp_serviceescalation->notification_interval = temp_service->notification_interval;
-			temp_serviceescalation->have_notification_interval = TRUE;
+		/* service escalations inherit contacts from service if none are specified */
+		if(temp_serviceescalation->have_contact_groups == FALSE && temp_serviceescalation->have_contacts == FALSE) {
+			xod_inherit_str(temp_serviceescalation, temp_service, contact_groups);
+			xod_inherit_str(temp_serviceescalation, temp_service, contacts);
 			}
 
+		/* service escalations inherit notification interval from service if not already defined */
+		xod_inherit(temp_serviceescalation, temp_service, notification_interval);
+
 		/* service escalations inherit escalation period from service if not already defined */
 		if(temp_serviceescalation->have_escalation_period == FALSE && temp_service->have_notification_period == TRUE && temp_service->notification_period != NULL) {
 			temp_serviceescalation->escalation_period = (char *)strdup(temp_service->notification_period);
@@ -4656,32 +4669,23 @@
 		if((temp_host = xodtemplate_find_real_host(temp_hostescalation->host_name)) == NULL)
 			continue;
 
-		/* host escalations inherit contact groups from service if not already specified */
-		if(temp_hostescalation->have_contact_groups == FALSE && temp_host->have_contact_groups == TRUE && temp_host->contact_groups != NULL) {
-			temp_hostescalation->contact_groups = (char *)strdup(temp_host->contact_groups);
-			temp_hostescalation->have_contact_groups = TRUE;
-			}
-
 		/* SPECIAL RULE 10/04/07 - additive inheritance from host's contactgroup(s) */
 		if(temp_hostescalation->contact_groups != NULL && temp_hostescalation->contact_groups[0] == '+')
 			xodtemplate_get_inherited_string(&temp_host->have_contact_groups, &temp_host->contact_groups, &temp_hostescalation->have_contact_groups, &temp_hostescalation->contact_groups);
 
-		/* host escalations inherit contacts from service if not already specified */
-		if(temp_hostescalation->have_contacts == FALSE && temp_host->have_contacts == TRUE && temp_host->contacts != NULL) {
-			temp_hostescalation->contacts = (char *)strdup(temp_host->contacts);
-			temp_hostescalation->have_contacts = TRUE;
-			}
-
 		/* SPECIAL RULE 10/04/07 - additive inheritance from host's contact(s) */
 		if(temp_hostescalation->contacts != NULL && temp_hostescalation->contacts[0] == '+')
 			xodtemplate_get_inherited_string(&temp_host->have_contacts, &temp_host->contacts, &temp_hostescalation->have_contacts, &temp_hostescalation->contacts);
 
-		/* host escalations inherit notification interval from host if not already defined */
-		if(temp_hostescalation->have_notification_interval == FALSE && temp_host->have_notification_interval == TRUE) {
-			temp_hostescalation->notification_interval = temp_host->notification_interval;
-			temp_hostescalation->have_notification_interval = TRUE;
+		/* host escalations inherit contacts from host if none are specified */
+		if(temp_hostescalation->have_contact_groups == FALSE && temp_hostescalation->have_contacts == FALSE) {
+			xod_inherit_str(temp_hostescalation, temp_host, contact_groups);
+			xod_inherit_str(temp_hostescalation, temp_host, contacts);
 			}
 
+		/* host escalations inherit notification interval from host if not already defined */
+		xod_inherit(temp_hostescalation, temp_host, notification_interval);
+
 		/* host escalations inherit escalation period from host if not already defined */
 		if(temp_hostescalation->have_escalation_period == FALSE && temp_host->have_notification_period == TRUE && temp_host->notification_period != NULL) {
 			temp_hostescalation->escalation_period = (char *)strdup(temp_host->notification_period);
@@ -5015,30 +5019,6 @@
 	return OK;
 	}
 
-/* simple inheritance macros. o = object, t = template, v = variable */
-#define xod_inherit(o, t, v) \
-	do { \
-		if(o->have_##v == FALSE && t->have_##v == TRUE) { \
-			o->v = t->v; \
-			o->have_##v = TRUE; \
-		} \
-	} while(0)
-
-#define xod_inherit_str_nohave(o, t, v) \
-	do { \
-		if(o->v == NULL && t->v != NULL) { \
-			o->v = (char *)strdup(t->v); \
-		} \
-	} while(0)
-
-#define xod_inherit_str(o, t, v) \
-	do { \
-		if(o->have_##v == FALSE && t->have_##v == TRUE) { \
-			xod_inherit_str_nohave(o, t, v); \
-			o->have_##v = TRUE; \
-		} \
-	} while(0)
-
 /* resolves a timeperiod object */
 int xodtemplate_resolve_timeperiod(xodtemplate_timeperiod *this_timeperiod) {
 	char *temp_ptr = NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2346
          http://nagios.svn.sourceforge.net/nagios/?rev=2346&view=rev
Author:   ageric
Date:     2012-10-15 12:05:59 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
xdata: Remove two useless #ifdef NSCORE

They're already inside conditions of the exact same type, so there's
no need to issue it again and make the code any harder to read.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-10-15 12:05:40 UTC (rev 2345)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-10-15 12:05:59 UTC (rev 2346)
@@ -253,9 +253,7 @@
 		/* determine the directory of the main config file */
 		if((config_file = (char *)strdup(main_config_file)) == NULL) {
 			my_free(xodtemplate_config_files);
-#ifdef NSCORE
 			printf("Unable to allocate memory!\n");
-#endif
 			return ERROR;
 			}
 		config_base_dir = (char *)strdup(dirname(config_file));
@@ -265,9 +263,7 @@
 		if((thefile = mmap_fopen(main_config_file)) == NULL) {
 			my_free(config_base_dir);
 			my_free(xodtemplate_config_files);
-#ifdef NSCORE
 			printf("Unable to open main config file '%s'\n", main_config_file);
-#endif
 			return ERROR;
 			}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2373
          http://nagios.svn.sourceforge.net/nagios/?rev=2373&view=rev
Author:   ageric
Date:     2012-10-20 08:22:17 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
xdata: Stop lying outrageously about precache savings

It's (sometimes) a little faster to use a precached config, but
reading the (often much) larger config takes a bit of time too,
and the savings are nowhere near as substantial as they once
were.

The largest saving I've seen is around 22%, but that's only for
certain parts of the restart sequence and not all of it, so it's
more like shaving 3-5% off of the total launch time.

However, since it's explicit which parts of config reading are
marked, we round it up to 25% when we give the hint.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-10-20 08:22:01 UTC (rev 2372)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-10-20 08:22:17 UTC (rev 2373)
@@ -485,7 +485,7 @@
 		printf("                      ============\n");
 		printf("TOTAL:                %.6lf sec  ", runtime[10]);
 		if(use_precached_objects == FALSE)
-			printf("* = %.6lf sec (%.2f%%) estimated savings", runtime[10] - runtime[9] - runtime[8] - runtime[0], ((runtime[10] - runtime[9] - runtime[8] - runtime[0]) / runtime[10]) * 100.0);
+			printf("* = %.6lf sec (%.2f%%) estimated savings", (runtime[10] - runtime[9] - runtime[8] - runtime[0]) / 4, ((runtime[10] - runtime[9] - runtime[8] - runtime[0]) / runtime[10]) * 25.0);
 		printf("\n");
 		printf("\n\n");
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2475
          http://nagios.svn.sourceforge.net/nagios/?rev=2475&view=rev
Author:   ageric
Date:     2012-11-22 13:14:31 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
xodtemplate: Fix obscure crash while loading configuration

We didn't initialize parent_map, meaning that it could have any value,
even though it appears it is not infrequently NULL, at least at first.

We then pointed it to a bitmap object iff
xodtemplate_servicedependency_list wasn't NULL, and finally freed it
unconditionally.

Thus, unless parent_map pointed at NULL or we have servicedependencies,
we'd get a crash.

Now, if we first add at least one servicedependency, run nagios, remove
all of them, and reload nagios, parent_map would still keep its old
value around, we wouldn't reallocate it, but we'd still free it, leading
to a crash.

This is prevented in the following ways:
 * First, make sure all bitmaps are NULL-initialized, clearly and
   obviously.
 * Second, only free parent_map if we did set it.
 * Third, set parent_map to NULL after we destroy() it - dangling
   pointers are evil.

Signed-off-by: Robin Sonefors <robin.sonefors@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-11-22 13:13:58 UTC (rev 2474)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-11-22 13:14:31 UTC (rev 2475)
@@ -118,9 +118,9 @@
 
 #ifndef NSCGI
 /* reusable bitmaps for expanding objects */
-static bitmap *host_map, *contact_map;
+static bitmap *host_map = NULL, *contact_map = NULL;
 #endif
-static bitmap *service_map, *parent_map;
+static bitmap *service_map = NULL, *parent_map = NULL;
 
 
 /*
@@ -6901,18 +6901,19 @@
 			logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Failed to create parent bitmap for service dependencies\n");
 			return ERROR;
 			}
-		}
-	for(sd = xodtemplate_servicedependency_list; sd; sd = next_sd) {
-		next_sd = sd->next;
+		for(sd = xodtemplate_servicedependency_list; sd; sd = next_sd) {
+			next_sd = sd->next;
 #ifdef NSCGI
-		if(xodtemplate_register_servicedependency(sd) == ERROR)
-			return ERROR;
+			if(xodtemplate_register_servicedependency(sd) == ERROR)
+				return ERROR;
 #else
-		if(xodtemplate_register_and_destroy_servicedependency(sd) == ERROR)
-			return ERROR;
+			if(xodtemplate_register_and_destroy_servicedependency(sd) == ERROR)
+				return ERROR;
 #endif
+			}
+		bitmap_destroy(parent_map);
+		parent_map = NULL;
 		}
-	bitmap_destroy(parent_map);
 	timing_point("%u unique / %u total servicedependencies registered\n",
 				 num_objects.servicedependencies, xodcount.servicedependencies);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2494
          http://nagios.svn.sourceforge.net/nagios/?rev=2494&view=rev
Author:   ageric
Date:     2012-11-29 11:14:25 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
xodtemplate: Fix crash when referring to invalid servicegroups

The code for printing error messages when a service is referring to an
invalid servicegroup was incorrect, because it used the wrong pointer -
which can be uninitialized - for writing file and line of the error.

In other words: when you do things incorrectly, nagios will no longer do
so too.

Signed-off-by: Robin Sonefors <robin.sonefors@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-11-29 11:14:05 UTC (rev 2493)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-11-29 11:14:25 UTC (rev 2494)
@@ -6452,7 +6452,7 @@
 		/* 10/19/07 EG an empry return value means an error occured */
 		if((servicegroup_names = xodtemplate_process_servicegroup_names(temp_service->service_groups, temp_service->_config_file, temp_service->_start_line)) == NULL) {
 			logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Failed to process servicegroup names for service '%s' on host '%s' (config file '%s', starting at line %d)\n",
-				  temp_service->service_description, temp_service->host_name, xodtemplate_config_file_name(temp_servicegroup->_config_file), temp_servicegroup->_start_line);
+				  temp_service->service_description, temp_service->host_name, xodtemplate_config_file_name(temp_service->_config_file), temp_service->_start_line);
 			return ERROR;
 			}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2504
          http://nagios.svn.sourceforge.net/nagios/?rev=2504&view=rev
Author:   ageric
Date:     2012-12-05 15:29:04 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
xod: Make group member parsing work with precached objects

This caused all manner of weird bugs, such as hostgroups being
empty and notifications not being sent out to contacts added to
contactgroups which in turn were set to be assigned to certain
hosts and services, but only when using precached objects, which
is how this slipped through the testing net.

With this patch the objects.precache is identical to the
objects.cache file generated from it after Nagios has parsed it,
with two exceptions:
 * The date/time thing will obviously differ.
 * All lists are printed in reverse order in objects.cache

The date thing I won't even bother commenting on. Just live with
it. The reverse order thing might be a bit of an issue though,
but since member lists aren't sorted in either file (and won't be
if Nagios is started without using a precache file) anyway, I
really don't care about that either.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-12-05 15:28:43 UTC (rev 2503)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-12-05 15:29:04 UTC (rev 2504)
@@ -368,46 +368,50 @@
 
 		/* cleanup some additive inheritance stuff... */
 		xodtemplate_clean_additive_strings();
+		}
 
-		host_map = bitmap_create(xodcount.hosts);
-		contact_map = bitmap_create(xodcount.contacts);
-		if(!host_map || !contact_map) {
-			logit(NSLOG_RUNTIME_ERROR, TRUE, "Error: Failed to create bitmaps for resolving objects\n");
-			return ERROR;
-			}
+	/* do the meat and potatoes stuff... */
+	host_map = bitmap_create(xodcount.hosts);
+	contact_map = bitmap_create(xodcount.contacts);
+	if(!host_map || !contact_map) {
+		logit(NSLOG_RUNTIME_ERROR, TRUE, "Error: Failed to create bitmaps for resolving objects\n");
+		return ERROR;
+		}
 
-		/* do the meat and potatoes stuff... */
-		if(result == OK)
-			result = xodtemplate_recombobulate_contactgroups();
-		if(test_scheduling == TRUE)
-			gettimeofday(&tv[3], NULL);
-		timing_point("Done recombobulating contactgroups\n");
+	if(result == OK)
+		result = xodtemplate_recombobulate_contactgroups();
+	if(test_scheduling == TRUE)
+		gettimeofday(&tv[3], NULL);
+	timing_point("Done recombobulating contactgroups\n");
 
-		if(result == OK)
-			result = xodtemplate_recombobulate_hostgroups();
-		if(test_scheduling == TRUE)
-			gettimeofday(&tv[4], NULL);
-		timing_point("Done recombobulating hostgroups\n");
+	if(result == OK)
+		result = xodtemplate_recombobulate_hostgroups();
+	if(test_scheduling == TRUE)
+		gettimeofday(&tv[4], NULL);
+	timing_point("Done recombobulating hostgroups\n");
 
+	if(use_precached_objects == FALSE) {
 		if(result == OK)
 			result = xodtemplate_duplicate_services();
 		if(test_scheduling == TRUE)
 			gettimeofday(&tv[5], NULL);
 		timing_point("Created %u services (dupes possible)\n", xodcount.services);
+		}
 
-		/* now we have an accurate service count */
-		service_map = bitmap_create(xodcount.services);
-		if(!service_map) {
-			logit(NSLOG_CONFIG_ERROR, TRUE, "Failed to create service map\n");
-			return ERROR;
-			}
+	/* now we have an accurate service count */
+	service_map = bitmap_create(xodcount.services);
+	if(!service_map) {
+		logit(NSLOG_CONFIG_ERROR, TRUE, "Failed to create service map\n");
+		return ERROR;
+		}
 
-		if(result == OK)
-			result = xodtemplate_recombobulate_servicegroups();
-		if(test_scheduling == TRUE)
-			gettimeofday(&tv[6], NULL);
-		timing_point("Done recombobulating servicegroups\n");
+	if(result == OK)
+		result = xodtemplate_recombobulate_servicegroups();
+	if(test_scheduling == TRUE)
+		gettimeofday(&tv[6], NULL);
+	timing_point("Done recombobulating servicegroups\n");
 
+	if(use_precached_objects == FALSE) {
 		if(result == OK)
 			result = xodtemplate_duplicate_objects();
 		if(test_scheduling == TRUE)
@@ -2615,6 +2619,7 @@
 							break;
 						case SKIPLIST_OK:
 							result = OK;
+							temp_service->id = xodcount.services++;
 							break;
 						default:
 							result = ERROR;
@@ -2640,6 +2645,7 @@
 							break;
 						case SKIPLIST_OK:
 							result = OK;
+							temp_service->id = xodcount.services++;
 							break;
 						default:
 							result = ERROR;
@@ -3991,7 +3997,6 @@
 
 	/* First loop for single host service definition*/
 	for(temp_service = xodtemplate_service_list; temp_service != NULL; temp_service = temp_service->next) {
-
 		/* skip services that shouldn't be registered */
 		if(temp_service->register_object == FALSE)
 			continue;
@@ -6088,6 +6093,10 @@
 			}
 		}
 
+	/* if we're using precached objects we can bail out now */
+	if(use_precached_objects)
+		return OK;
+
 	/* process all contacts with contactgroups directives */
 	for(temp_contact = xodtemplate_contact_list; temp_contact != NULL; temp_contact = temp_contact->next) {
 
@@ -6260,6 +6269,10 @@
 			}
 		}
 
+	/* if we're using precached objects we can bail out now */
+	if(use_precached_objects)
+		return OK;
+
 	/* process all hosts that have hostgroup directives */
 	for(temp_host = xodtemplate_host_list; temp_host != NULL; temp_host = temp_host->next) {
 
@@ -6437,6 +6450,10 @@
 			}
 		}
 
+	/* if we're using precached objects we can bail out now */
+	if(use_precached_objects == TRUE)
+		return OK;
+
 	/* Add services from 'servicegroups' directive */
 	for(temp_service = xodtemplate_service_list; temp_service != NULL; temp_service = temp_service->next) {
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2551
          http://nagios.svn.sourceforge.net/nagios/?rev=2551&view=rev
Author:   estanley375
Date:     2012-12-28 11:56:53 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
Fixed bug #401: segmentation fault on Solaris when parsing unknown timeperiod directives.

Previously the end of the function xodtemplate_parse_timeperiod_directive 
was referencing a pointer after it had been freed (and NULLed). This 
has been corrected.

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2012-12-28 11:54:32 UTC (rev 2550)
+++ nagioscore/trunk/xdata/xodtemplate.c	2012-12-28 11:56:53 UTC (rev 2551)
@@ -3798,17 +3798,16 @@
 	else
 		result = ERROR;
 
-	/* free memory */
-	my_free(input);
-
-	if(result == ERROR) {
 #ifdef NSCORE
+	if(result == ERROR) {
 		printf("Error: Could not parse timeperiod directive '%s'!\n", input);
-#endif
-		return ERROR;
 		}
+#endif
 
-	return OK;
+	/* free memory */
+	my_free(input);
+
+	return result;
 	}
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2596
          http://nagios.svn.sourceforge.net/nagios/?rev=2596&view=rev
Author:   ageric
Date:     2013-02-06 09:39:37 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
xodtemplate: Clear the children map when creating servicedependencies

Otherwise we can't have more than one dependency from a single
service, or one that's been excluded from another servicedependency.

This went unnoticed in the wild for a long time and most likely would
have remained that way, as people generally tend to have each service
depend on only one other. With this patch the code seems to do what
it's supposed to though, which is block multiple service dependencies
from being created from the same object to the same object from a
single config object statement.

Objects galore there. Good thing at least I know what I mean...

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2013-02-06 09:39:21 UTC (rev 2595)
+++ nagioscore/trunk/xdata/xodtemplate.c	2013-02-06 09:39:37 UTC (rev 2596)
@@ -4782,6 +4782,7 @@
 
 	parents = children = NULL;
 	bitmap_clear(parent_map);
+	bitmap_clear(service_map);
 
 	/* create the two object lists */
 	if(xodtemplate_create_service_list(&parents, parent_map, temp_servicedependency->host_name, temp_servicedependency->hostgroup_name, temp_servicedependency->servicegroup_name, temp_servicedependency->service_description, temp_servicedependency->_config_file, temp_servicedependency->_start_line) != OK) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2606
          http://nagios.svn.sourceforge.net/nagios/?rev=2606&view=rev
Author:   ageric
Date:     2013-02-15 12:09:59 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
xodtemplate: Avoid free()'ing dependent hostlist multiple times

For the (rather unusual) case when we have hosts depending on
multiple others using hostdependencies, we used to crash with a
segfault when loading the configuration (regardless of whether we
verified it to start running or just as a part of a config restart
test thing).

The problem was due to some overexcited optimization on my behalf,
attempting to free() the variables of an inner loop while parsing
it, regardless of whether we needed to parse it again later or
not.

With this patch, the config verifies nicely and Nagios can load
it without problems.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2013-02-15 12:09:41 UTC (rev 2605)
+++ nagioscore/trunk/xdata/xodtemplate.c	2013-02-15 12:09:59 UTC (rev 2606)
@@ -4695,7 +4695,7 @@
 {
 	xodtemplate_hostdependency *temp_hostdependency = (xodtemplate_hostdependency *)hd_;
 	objectlist *master_hostlist = NULL, *dependent_hostlist = NULL;
-	objectlist *list, *next, *l2, *n2;
+	objectlist *list, *next, *l2;
 
 	/* skip host dependencies without enough data */
 	if(temp_hostdependency->hostgroup_name == NULL && temp_hostdependency->dependent_hostgroup_name == NULL && temp_hostdependency->host_name == NULL && temp_hostdependency->dependent_host_name == NULL)
@@ -4729,22 +4729,21 @@
 		next = list->next;
 		free(list);
 
-		for(l2 = dependent_hostlist; l2; l2 = n2) {
+		for(l2 = dependent_hostlist; l2; l2 = l2->next) {
 			xodtemplate_host *child = (xodtemplate_host *)l2->object_ptr;
-			n2 = l2->next;
-			free(l2);
 
 			temp_hostdependency->host_name = master->host_name;
 			temp_hostdependency->dependent_host_name = child->host_name;
 			if(xodtemplate_register_hostdependency(temp_hostdependency) != OK) {
 				/* exit on error */
+				free_objectlist(&dependent_hostlist);
 				free_objectlist(&next);
-				free_objectlist(&n2);
 				return ERROR;
 				}
 			}
 		}
 
+	free_objectlist(&dependent_hostlist);
 	my_free(temp_hostdependency->dependency_period);
 	my_free(temp_hostdependency);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2659
          http://nagios.svn.sourceforge.net/nagios/?rev=2659&view=rev
Author:   ageric
Date:     2013-03-14 13:18:43 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
xodtemplate: Fix same-host service dependencies with inexact master

Weird subject, but here's the thing. In Nagios 3 we supported
same-host servicedependencies where the host was defined by having
exact settings for the dependent services (such as a servicegroup
or a combination of dependent_hostgroup_name/dependent_host_name
AND dependent_service_description). With Nagios 4-ish, that test
slipped through the testing net, even though we actually have a
test configuration just like that checked in alongside the code.

With this patch, we no longer bomb out when given servicedependencies
such as this:
  define servicedependency {
     service_description           some-service
     dependent_servicegroup        some-service-group
     notification_failure_criteria w,c
  }

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2013-03-14 13:18:25 UTC (rev 2658)
+++ nagioscore/trunk/xdata/xodtemplate.c	2013-03-14 13:18:43 UTC (rev 2659)
@@ -4755,7 +4755,7 @@
 	objectlist *parents = NULL, *plist, *pnext;
 	objectlist *children = NULL, *clist;
 	xodtemplate_servicedependency *temp_servicedependency = (xodtemplate_servicedependency *)sd_;
-	int same_host = FALSE;
+	int same_host = FALSE, children_first = FALSE, pret = OK, cret = OK;
 	char *hname, *sdesc, *dhname, *dsdesc;
 
 	hname = temp_servicedependency->host_name;
@@ -4770,11 +4770,26 @@
 	if(temp_servicedependency->register_object == 0)
 		return OK;
 
+	if(!temp_servicedependency->host_name && !temp_servicedependency->hostgroup_name
+	   && !temp_servicedependency->servicegroup_name)
+	{
+		/*
+		 * parent service is in exact. We must take children first
+		 * and build parent chain from same-host deps there
+		 */
+		children_first = TRUE;
+		same_host = TRUE;
+	}
+
 	/* take care of same-host dependencies */
 	if(!temp_servicedependency->dependent_host_name && !temp_servicedependency->dependent_hostgroup_name) {
-		if(!temp_servicedependency->dependent_service_description)
-			; /* do nothing. might be dependent_servicegroup_name */
-		else {
+		if (!temp_servicedependency->dependent_servicegroup_name) {
+			if (children_first || !temp_servicedependency->dependent_service_description) {
+				logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Impossible service dependency definition\n (config file '%s', starting at line '%d')",
+					  xodtemplate_config_file_name(temp_servicedependency->_config_file),
+					  temp_servicedependency->_start_line);
+				return ERROR;
+			}
 			same_host = TRUE;
 		}
 	}
@@ -4784,20 +4799,35 @@
 	bitmap_clear(service_map);
 
 	/* create the two object lists */
-	if(xodtemplate_create_service_list(&parents, parent_map, temp_servicedependency->host_name, temp_servicedependency->hostgroup_name, temp_servicedependency->servicegroup_name, temp_servicedependency->service_description, temp_servicedependency->_config_file, temp_servicedependency->_start_line) != OK) {
+	if(!children_first) {
+		pret = xodtemplate_create_service_list(&parents, parent_map, temp_servicedependency->host_name, temp_servicedependency->hostgroup_name, temp_servicedependency->servicegroup_name, temp_servicedependency->service_description, temp_servicedependency->_config_file, temp_servicedependency->_start_line);
+		if (!same_host)
+			cret = xodtemplate_create_service_list(&children, service_map, temp_servicedependency->dependent_host_name, temp_servicedependency->dependent_hostgroup_name, temp_servicedependency->dependent_servicegroup_name, temp_servicedependency->dependent_service_description, temp_servicedependency->_config_file, temp_servicedependency->_start_line);
+	} else {
+		/*
+		 * NOTE: we flip the variables here to avoid duplicating
+		 * the entire loop down below
+		 */
+		cret = xodtemplate_create_service_list(&parents, parent_map, temp_servicedependency->dependent_host_name, temp_servicedependency->dependent_hostgroup_name, temp_servicedependency->dependent_servicegroup_name, temp_servicedependency->dependent_service_description, temp_servicedependency->_config_file, temp_servicedependency->_start_line);
+		dsdesc = temp_servicedependency->service_description;
+		sdesc = temp_servicedependency->dependent_service_description;
+	}
+
+	/* now log errors and bail out if we failed to get members */
+	if(pret != OK) {
 		logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Could not expand master service(s) (config file '%s', starting at line %d)\n",
 			  xodtemplate_config_file_name(temp_servicedependency->_config_file),
 			  temp_servicedependency->_start_line);
-		return ERROR;
 		}
-
-	if(same_host == FALSE && xodtemplate_create_service_list(&children, service_map, temp_servicedependency->dependent_host_name, temp_servicedependency->dependent_hostgroup_name, temp_servicedependency->dependent_servicegroup_name, temp_servicedependency->dependent_service_description, temp_servicedependency->_config_file, temp_servicedependency->_start_line) != OK) {
+	if(cret != OK) {
 		logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Could not expand dependent service(s) (at config file '%s', starting on line %d)\n",
 			  xodtemplate_config_file_name(temp_servicedependency->_config_file),
 			  temp_servicedependency->_start_line);
-		return ERROR;
 		}
 
+	if(cret != OK || pret != OK)
+		return ERROR;
+
 	/*
 	 * every service in "children" depends on every service in
 	 * "parents", so just loop twice and create them all.
@@ -4818,8 +4848,12 @@
 		 */
 		if(same_host) {
 			children = NULL;
-			if(xodtemplate_expand_services(&children, service_map, p->host_name, dsdesc, temp_servicedependency->_config_file, temp_servicedependency->_start_line) != OK)
+			if(xodtemplate_expand_services(&children, service_map, p->host_name, dsdesc, temp_servicedependency->_config_file, temp_servicedependency->_start_line) != OK) {
+				logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Failed to expand same-host servicedependency services (config file '%s', starting at line %d)\n",
+					  xodtemplate_config_file_name(temp_servicedependency->_config_file),
+					  temp_servicedependency->_start_line);
 				return ERROR;
+			}
 		}
 		for(clist = children; clist; clist = clist->next) {
 			xodtemplate_service *c = (xodtemplate_service *)clist->object_ptr;
@@ -4827,7 +4861,12 @@
 				continue;
 			bitmap_set(service_map, c->id);
 
-			/* now register */
+			/* now register, but flip the states again if necessary */
+			if(children_first) {
+				xodtemplate_service *tmp = p;
+				p = c;
+				c = tmp;
+			}
 			temp_servicedependency->host_name = p->host_name;
 			temp_servicedependency->service_description = p->service_description;
 			temp_servicedependency->dependent_host_name = c->host_name;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2717
          http://nagios.svn.sourceforge.net/nagios/?rev=2717&view=rev
Author:   ageric
Date:     2013-04-07 15:36:39 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
xdata/xodtemplate: Count escalations even when using precached objects

Otherwise we'll crash out while reading config from a precached object
file contiaining escalations.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2013-04-04 09:29:57 UTC (rev 2716)
+++ nagioscore/trunk/xdata/xodtemplate.c	2013-04-07 15:36:39 UTC (rev 2717)
@@ -3475,13 +3475,14 @@
 /* completes an object definition */
 int xodtemplate_end_object_definition(int options) {
 	int result = OK;
-#ifdef NSCGI
-	switch(xodtemplate_current_object_type) {
-	case XODTEMPLATE_HOSTESCALATION: xodcount.hostescalations++; break;
-	case XODTEMPLATE_SERVICEESCALATION: xodcount.serviceescalations++; break;
-	}
-#endif
 
+	if (use_precached_objects == TRUE) {
+		switch(xodtemplate_current_object_type) {
+		case XODTEMPLATE_HOSTESCALATION: xodcount.hostescalations++; break;
+		case XODTEMPLATE_SERVICEESCALATION: xodcount.serviceescalations++; break;
+			}
+		}
+
 	xodtemplate_current_object = NULL;
 	xodtemplate_current_object_type = XODTEMPLATE_NONE;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2755
          http://nagios.svn.sourceforge.net/nagios/?rev=2755&view=rev
Author:   ageric
Date:     2013-05-08 14:01:27 +0000 (Wed, 08 May 2013)
Log Message:
-----------
xod: Plug a memory leak in xdata/xodtemplate.c

On soft reloads, we used to leak the bitmaps we created to track
contacts, hosts and services. This patch adds the necessary calls
to get rid of it.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2013-05-06 12:18:46 UTC (rev 2754)
+++ nagioscore/trunk/xdata/xodtemplate.c	2013-05-08 14:01:27 UTC (rev 2755)
@@ -502,6 +502,10 @@
 		}
 #endif
 
+	bitmap_destroy(contact_map);
+	bitmap_destroy(host_map);
+	bitmap_destroy(service_map);
+
 	return result;
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2756
          http://nagios.svn.sourceforge.net/nagios/?rev=2756&view=rev
Author:   ageric
Date:     2013-05-08 14:01:47 +0000 (Wed, 08 May 2013)
Log Message:
-----------
xod: Make sure we free servicedependency templates

Apparently we forgot to do that earlier. For host dependencies this
doesn't seem to be a problem.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2013-05-08 14:01:27 UTC (rev 2755)
+++ nagioscore/trunk/xdata/xodtemplate.c	2013-05-08 14:01:47 UTC (rev 2756)
@@ -4769,9 +4769,16 @@
 	my_free(temp_servicedependency->name);
 	my_free(temp_servicedependency->template);
 
-	/* skip templates */
-	if(temp_servicedependency->register_object == 0)
+	/* skip templates, but free them first */
+	if(temp_servicedependency->register_object == 0) {
+		my_free(temp_servicedependency->host_name);
+		my_free(temp_servicedependency->service_description);
+		my_free(temp_servicedependency->hostgroup_name);
+		my_free(temp_servicedependency->dependent_host_name);
+		my_free(temp_servicedependency->dependent_service_description);
+		my_free(temp_servicedependency->dependent_hostgroup_name);
 		return OK;
+		}
 
 	if(!temp_servicedependency->host_name && !temp_servicedependency->hostgroup_name
 	   && !temp_servicedependency->servicegroup_name)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2761
          http://nagios.svn.sourceforge.net/nagios/?rev=2761&view=rev
Author:   ageric
Date:     2013-05-08 14:03:29 +0000 (Wed, 08 May 2013)
Log Message:
-----------
xod: Avoid printf() calls

Changing it to a logging call makes a lot more sense.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2013-05-08 14:03:12 UTC (rev 2760)
+++ nagioscore/trunk/xdata/xodtemplate.c	2013-05-08 14:03:29 UTC (rev 2761)
@@ -8973,7 +8973,7 @@
 		/* expand host */
 		result = xodtemplate_expand_hostgroups(&glist, reject, hostgroups, _config_file, _start_line);
 		if(result != OK) {
-			printf("Failed to expand hostgroups '%s' to something sensible\n", hostgroups);
+			logit(NSLOG_CONFIG_ERROR, TRUE, "Failed to expand hostgroups '%s' to something sensible\n", hostgroups);
 			free_objectlist(&glist);
 			bitmap_destroy(reject);
 			return NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2763
          http://nagios.svn.sourceforge.net/nagios/?rev=2763&view=rev
Author:   ageric
Date:     2013-05-08 14:04:10 +0000 (Wed, 08 May 2013)
Log Message:
-----------
xod: Launch a massive strike in the war against strdup()

We already get an allocated and duplicated buffer from mmap_fgets(),
so there's no need for us copy it again, and then once more to get
the value part of the variable in a separate string.

Instead, we avoid the two extra copies per object config entry and
simply modify the input in-place.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/xdata/xodtemplate.c

Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c	2013-05-08 14:03:50 UTC (rev 2762)
+++ nagioscore/trunk/xdata/xodtemplate.c	2013-05-08 14:04:10 UTC (rev 2763)
@@ -1097,9 +1097,7 @@
 	xodtemplate_hostescalation *temp_hostescalation = NULL;
 	xodtemplate_hostextinfo *temp_hostextinfo = NULL;
 	xodtemplate_serviceextinfo *temp_serviceextinfo = NULL;
-	register int x = 0;
-	register int y = 0;
-	int force_skiplists = FALSE;
+	int x, y, force_skiplists = FALSE;
 
 
 	/* should some object definitions be added to skiplists immediately? */
@@ -1174,24 +1172,23 @@
 		}
 
 	/* get variable name */
-	if((variable = (char *)strdup(input)) == NULL)
-		return ERROR;
+	variable = input;
 	/* trim at first whitespace occurance */
-	for(x = 0, y = 0; variable[x] != '\x0'; x++) {
-		if(variable[x] == ' ' || variable[x] == '\t')
+	for(x = 0; variable[x] != '\x0'; x++) {
+		if(variable[x] == ' ' || variable[x] == '\t') {
+			variable[x] = 0;
+			y = x;
 			break;
-		y++;
+			}
 		}
-	variable[y] = '\x0';
 
 	/* get variable value */
-	if((value = (char *)strdup(input + x)) == NULL) {
-		my_free(variable);
-		return ERROR;
-		}
+	value = input + x + 1;
+	while (*value == ' ' || *value == '\t')
+		value++;
+	/* now strip trailing spaces */
 	strip(value);
 
-
 	switch(xodtemplate_current_object_type) {
 
 		case XODTEMPLATE_TIMEPERIOD:
@@ -3466,10 +3463,6 @@
 			break;
 		}
 
-	/* free memory */
-	my_free(variable);
-	my_free(value);
-
 	return result;
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.