[Nagios-checkins] CVS: nagios/xdata xedtemplate.c,1.2,1.3 xodtemplate.c,1.16,1.17 xodtemplate.h,1.6,1.7

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nagios/xdata
In directory usw-pr-cvs1:/tmp/cvs-serv12273/xdata

Modified Files:
	xedtemplate.c xodtemplate.c xodtemplate.h 
Log Message:
Misc updates and more template magic

Index: xedtemplate.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xedtemplate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** xedtemplate.c	27 Apr 2002 05:44:07 -0000	1.2
--- xedtemplate.c	20 Aug 2002 02:43:19 -0000	1.3
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2002 Ethan Galstad (na...@na...)
!  * Last Modified:   02-20-2002
   *
   * Description:
--- 4,8 ----
   *
   * Copyright (c) 2001-2002 Ethan Galstad (na...@na...)
!  * Last Modified:   08-19-2002
   *
   * Description:
***************
*** 457,470 ****
  
  		if(!strcmp(variable,"use")){
! 			temp_hostextinfo->template=(char *)malloc(strlen(value)+1);
  			if(temp_hostextinfo->template==NULL)
  				return ERROR;
- 			strcpy(temp_hostextinfo->template,value);
  		        }
  		else if(!strcmp(variable,"name")){
! 			temp_hostextinfo->name=(char *)malloc(strlen(value)+1);
  			if(temp_hostextinfo->name==NULL)
  				return ERROR;
- 			strcpy(temp_hostextinfo->name,value);
  		        }
  		else if(!strcmp(variable,"host_name")){
--- 457,468 ----
  
  		if(!strcmp(variable,"use")){
! 			temp_hostextinfo->template=strdup(value);
  			if(temp_hostextinfo->template==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"name")){
! 			temp_hostextinfo->name=strdup(value);
  			if(temp_hostextinfo->name==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"host_name")){
***************
*** 475,512 ****
  		        }
  		else if(!strcmp(variable,"hostgroup")){
! 			temp_hostextinfo->hostgroup=(char *)malloc(strlen(value)+1);
  			if(temp_hostextinfo->hostgroup==NULL)
  				return ERROR;
- 			strcpy(temp_hostextinfo->hostgroup,value);
  		        }
  		else if(!strcmp(variable,"notes_url")){
! 			temp_hostextinfo->notes_url=(char *)malloc(strlen(value)+1);
  			if(temp_hostextinfo->notes_url==NULL)
  				return ERROR;
- 			strcpy(temp_hostextinfo->notes_url,value);
  		        }
  		else if(!strcmp(variable,"icon_image")){
! 			temp_hostextinfo->icon_image=(char *)malloc(strlen(value)+1);
  			if(temp_hostextinfo->icon_image==NULL)
  				return ERROR;
- 			strcpy(temp_hostextinfo->icon_image,value);
  		        }
  		else if(!strcmp(variable,"icon_image_alt")){
! 			temp_hostextinfo->icon_image_alt=(char *)malloc(strlen(value)+1);
  			if(temp_hostextinfo->icon_image_alt==NULL)
  				return ERROR;
- 			strcpy(temp_hostextinfo->icon_image_alt,value);
  		        }
  		else if(!strcmp(variable,"vrml_image")){
! 			temp_hostextinfo->vrml_image=(char *)malloc(strlen(value)+1);
  			if(temp_hostextinfo->vrml_image==NULL)
  				return ERROR;
- 			strcpy(temp_hostextinfo->vrml_image,value);
  		        }
  		else if(!strcmp(variable,"gd2_image")|| !strcmp(variable,"statusmap_image")){
! 			temp_hostextinfo->gd2_image=(char *)malloc(strlen(value)+1);
  			if(temp_hostextinfo->gd2_image==NULL)
  				return ERROR;
- 			strcpy(temp_hostextinfo->gd2_image,value);
  		        }
  		else if(!strcmp(variable,"2d_coords")){
--- 473,504 ----
  		        }
  		else if(!strcmp(variable,"hostgroup")){
! 			temp_hostextinfo->hostgroup=strdup(value);
  			if(temp_hostextinfo->hostgroup==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"notes_url")){
! 			temp_hostextinfo->notes_url=strdup(value);
  			if(temp_hostextinfo->notes_url==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"icon_image")){
! 			temp_hostextinfo->icon_image=strdup(value);
  			if(temp_hostextinfo->icon_image==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"icon_image_alt")){
! 			temp_hostextinfo->icon_image_alt=strdup(value);
  			if(temp_hostextinfo->icon_image_alt==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"vrml_image")){
! 			temp_hostextinfo->vrml_image=strdup(value);
  			if(temp_hostextinfo->vrml_image==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"gd2_image")|| !strcmp(variable,"statusmap_image")){
! 			temp_hostextinfo->gd2_image=strdup(value);
  			if(temp_hostextinfo->gd2_image==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"2d_coords")){
***************
*** 546,595 ****
  
  		if(!strcmp(variable,"use")){
! 			temp_serviceextinfo->template=(char *)malloc(strlen(value)+1);
  			if(temp_serviceextinfo->template==NULL)
  				return ERROR;
- 			strcpy(temp_serviceextinfo->template,value);
  		        }
  		else if(!strcmp(variable,"name")){
! 			temp_serviceextinfo->name=(char *)malloc(strlen(value)+1);
  			if(temp_serviceextinfo->name==NULL)
  				return ERROR;
- 			strcpy(temp_serviceextinfo->name,value);
  		        }
  		else if(!strcmp(variable,"host_name")){
! 			temp_serviceextinfo->host_name=(char *)malloc(strlen(value)+1);
  			if(temp_serviceextinfo->host_name==NULL)
  				return ERROR;
- 			strcpy(temp_serviceextinfo->host_name,value);
  		        }
  		else if(!strcmp(variable,"hostgroup")){
! 			temp_serviceextinfo->hostgroup=(char *)malloc(strlen(value)+1);
  			if(temp_serviceextinfo->hostgroup==NULL)
  				return ERROR;
- 			strcpy(temp_serviceextinfo->hostgroup,value);
  		        }
  		else if(!strcmp(variable,"service_description")){
! 			temp_serviceextinfo->service_description=(char *)malloc(strlen(value)+1);
  			if(temp_serviceextinfo->service_description==NULL)
  				return ERROR;
- 			strcpy(temp_serviceextinfo->service_description,value);
  		        }
  		else if(!strcmp(variable,"notes_url")){
! 			temp_serviceextinfo->notes_url=(char *)malloc(strlen(value)+1);
  			if(temp_serviceextinfo->notes_url==NULL)
  				return ERROR;
- 			strcpy(temp_serviceextinfo->notes_url,value);
  		        }
  		else if(!strcmp(variable,"icon_image")){
! 			temp_serviceextinfo->icon_image=(char *)malloc(strlen(value)+1);
  			if(temp_serviceextinfo->icon_image==NULL)
  				return ERROR;
- 			strcpy(temp_serviceextinfo->icon_image,value);
  		        }
  		else if(!strcmp(variable,"icon_image_alt")){
! 			temp_serviceextinfo->icon_image_alt=(char *)malloc(strlen(value)+1);
  			if(temp_serviceextinfo->icon_image_alt==NULL)
  				return ERROR;
- 			strcpy(temp_serviceextinfo->icon_image_alt,value);
  		        }
  		else if(!strcmp(variable,"register"))
--- 538,579 ----
  
  		if(!strcmp(variable,"use")){
! 			temp_serviceextinfo->template=strdup(value);
  			if(temp_serviceextinfo->template==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"name")){
! 			temp_serviceextinfo->name=strdup(value);
  			if(temp_serviceextinfo->name==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"host_name")){
! 			temp_serviceextinfo->host_name=strdup(value);
  			if(temp_serviceextinfo->host_name==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"hostgroup")){
! 			temp_serviceextinfo->hostgroup=strdup(value);
  			if(temp_serviceextinfo->hostgroup==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"service_description")){
! 			temp_serviceextinfo->service_description=strdup(value);
  			if(temp_serviceextinfo->service_description==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"notes_url")){
! 			temp_serviceextinfo->notes_url=strdup(value);
  			if(temp_serviceextinfo->notes_url==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"icon_image")){
! 			temp_serviceextinfo->icon_image=strdup(value);
  			if(temp_serviceextinfo->icon_image==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"icon_image_alt")){
! 			temp_serviceextinfo->icon_image_alt=strdup(value);
  			if(temp_serviceextinfo->icon_image_alt==NULL)
  				return ERROR;
  		        }
  		else if(!strcmp(variable,"register"))
***************
*** 663,672 ****
  
  		/* allocate memory for host name list */
! 		host_names=(char *)malloc(strlen(temp_hostextinfo->host_name)+1);
  		if(host_names==NULL)
  			continue;
  
- 		strcpy(host_names,temp_hostextinfo->host_name);
- 
  		/* duplicate service entries */
  		first_item=TRUE;
--- 647,654 ----
  
  		/* allocate memory for host name list */
! 		host_names=strdup(temp_hostextinfo->host_name);
  		if(host_names==NULL)
  			continue;
  
  		/* duplicate service entries */
  		first_item=TRUE;
***************
*** 702,711 ****
  
  		/* allocate memory for host name list */
! 		hostgroup_names=(char *)malloc(strlen(temp_hostextinfo->hostgroup)+1);
  		if(hostgroup_names==NULL)
  			continue;
  
- 		strcpy(hostgroup_names,temp_hostextinfo->hostgroup);
- 
  		/* duplicate host entries */
  		first_item=TRUE;
--- 684,691 ----
  
  		/* allocate memory for host name list */
! 		hostgroup_names=strdup(temp_hostextinfo->hostgroup);
  		if(hostgroup_names==NULL)
  			continue;
  
  		/* duplicate host entries */
  		first_item=TRUE;
***************
*** 728,737 ****
  
  					if(temp_hostextinfo->host_name==NULL){
! 						temp_hostextinfo->host_name=(char *)malloc(strlen(temp_host->name)+1);
  						if(temp_hostextinfo->host_name==NULL){
  							free(hostgroup_names);
  							return ERROR;
  						        }
- 						strcpy(temp_hostextinfo->host_name,temp_host->name);
  					        }
  					else{
--- 708,716 ----
  
  					if(temp_hostextinfo->host_name==NULL){
! 						temp_hostextinfo->host_name=strdup(temp_host->name);
  						if(temp_hostextinfo->host_name==NULL){
  							free(hostgroup_names);
  							return ERROR;
  						        }
  					        }
  					else{
***************
*** 773,782 ****
  
  		/* allocate memory for host name list */
! 		host_names=(char *)malloc(strlen(temp_serviceextinfo->host_name)+1);
  		if(host_names==NULL)
  			continue;
  
- 		strcpy(host_names,temp_serviceextinfo->host_name);
- 
  		/* duplicate service entries */
  		first_item=TRUE;
--- 752,759 ----
  
  		/* allocate memory for host name list */
! 		host_names=strdup(temp_serviceextinfo->host_name);
  		if(host_names==NULL)
  			continue;
  
  		/* duplicate service entries */
  		first_item=TRUE;
***************
*** 838,847 ****
  
  					if(temp_serviceextinfo->host_name==NULL){
! 						temp_serviceextinfo->host_name=(char *)malloc(strlen(temp_host->name)+1);
  						if(temp_serviceextinfo->host_name==NULL){
  							free(hostgroup_names);
  							return ERROR;
  						        }
- 						strcpy(temp_serviceextinfo->host_name,temp_host->name);
  					        }
  					else{
--- 815,823 ----
  
  					if(temp_serviceextinfo->host_name==NULL){
! 						temp_serviceextinfo->host_name=strdup(temp_host->name);
  						if(temp_serviceextinfo->host_name==NULL){
  							free(hostgroup_names);
  							return ERROR;
  						        }
  					        }
  					else{
***************
*** 905,953 ****
  
  	/* duplicate strings (host_name member is passed in) */
! 	if(host_name!=NULL){
! 		new_hostextinfo->host_name=(char *)malloc(strlen(host_name)+1);
! 		if(new_hostextinfo->host_name!=NULL)
! 			strcpy(new_hostextinfo->host_name,host_name);
! 	        }
! 	if(this_hostextinfo->template!=NULL){
! 		new_hostextinfo->template=(char *)malloc(strlen(this_hostextinfo->template)+1);
! 		if(new_hostextinfo->template!=NULL)
! 			strcpy(new_hostextinfo->template,this_hostextinfo->template);
! 	        }
! 	if(this_hostextinfo->name!=NULL){
! 		new_hostextinfo->name=(char *)malloc(strlen(this_hostextinfo->name)+1);
! 		if(new_hostextinfo->name!=NULL)
! 			strcpy(new_hostextinfo->name,this_hostextinfo->name);
! 	        }
! 	if(this_hostextinfo->hostgroup!=NULL){
! 		new_hostextinfo->hostgroup=(char *)malloc(strlen(this_hostextinfo->hostgroup)+1);
! 		if(new_hostextinfo->hostgroup!=NULL)
! 			strcpy(new_hostextinfo->hostgroup,this_hostextinfo->hostgroup);
! 	        }
! 	if(this_hostextinfo->notes_url!=NULL){
! 		new_hostextinfo->notes_url=(char *)malloc(strlen(this_hostextinfo->notes_url)+1);
! 		if(new_hostextinfo->notes_url!=NULL)
! 			strcpy(new_hostextinfo->notes_url,this_hostextinfo->notes_url);
! 	        }
! 	if(this_hostextinfo->icon_image!=NULL){
! 		new_hostextinfo->icon_image=(char *)malloc(strlen(this_hostextinfo->icon_image)+1);
! 		if(new_hostextinfo->icon_image!=NULL)
! 			strcpy(new_hostextinfo->icon_image,this_hostextinfo->icon_image);
! 	        }
! 	if(this_hostextinfo->icon_image_alt!=NULL){
! 		new_hostextinfo->icon_image_alt=(char *)malloc(strlen(this_hostextinfo->icon_image_alt)+1);
! 		if(new_hostextinfo->icon_image_alt!=NULL)
! 			strcpy(new_hostextinfo->icon_image_alt,this_hostextinfo->icon_image_alt);
! 	        }
! 	if(this_hostextinfo->vrml_image!=NULL){
! 		new_hostextinfo->vrml_image=(char *)malloc(strlen(this_hostextinfo->vrml_image)+1);
! 		if(new_hostextinfo->vrml_image!=NULL)
! 			strcpy(new_hostextinfo->vrml_image,this_hostextinfo->vrml_image);
! 	        }
! 	if(this_hostextinfo->gd2_image!=NULL){
! 		new_hostextinfo->gd2_image=(char *)malloc(strlen(this_hostextinfo->gd2_image)+1);
! 		if(new_hostextinfo->gd2_image!=NULL)
! 			strcpy(new_hostextinfo->gd2_image,this_hostextinfo->gd2_image);
! 	        }
  
  	/* duplicate non-string members */
--- 881,902 ----
  
  	/* duplicate strings (host_name member is passed in) */
! 	if(host_name!=NULL)
! 		new_hostextinfo->host_name=strdup(host_name);
! 	if(this_hostextinfo->template!=NULL)
! 		new_hostextinfo->template=strdup(this_hostextinfo->template);
! 	if(this_hostextinfo->name!=NULL)
! 		new_hostextinfo->name=strdup(this_hostextinfo->name);
! 	if(this_hostextinfo->hostgroup!=NULL)
! 		new_hostextinfo->hostgroup=strdup(this_hostextinfo->hostgroup);
! 	if(this_hostextinfo->notes_url!=NULL)
! 		new_hostextinfo->notes_url=strdup(this_hostextinfo->notes_url);
! 	if(this_hostextinfo->icon_image!=NULL)
! 		new_hostextinfo->icon_image=strdup(this_hostextinfo->icon_image);
! 	if(this_hostextinfo->icon_image_alt!=NULL)
! 		new_hostextinfo->icon_image_alt=strdup(this_hostextinfo->icon_image_alt);
! 	if(this_hostextinfo->vrml_image!=NULL)
! 		new_hostextinfo->vrml_image=strdup(this_hostextinfo->vrml_image);
! 	if(this_hostextinfo->gd2_image!=NULL)
! 		new_hostextinfo->gd2_image=strdup(this_hostextinfo->gd2_image);
  
  	/* duplicate non-string members */
***************
*** 1000,1043 ****
  
  	/* duplicate strings (host_name member is passed in) */
! 	if(host_name!=NULL){
! 		new_serviceextinfo->host_name=(char *)malloc(strlen(host_name)+1);
! 		if(new_serviceextinfo->host_name!=NULL)
! 			strcpy(new_serviceextinfo->host_name,host_name);
! 	        }
! 	if(this_serviceextinfo->template!=NULL){
! 		new_serviceextinfo->template=(char *)malloc(strlen(this_serviceextinfo->template)+1);
! 		if(new_serviceextinfo->template!=NULL)
! 			strcpy(new_serviceextinfo->template,this_serviceextinfo->template);
! 	        }
! 	if(this_serviceextinfo->name!=NULL){
! 		new_serviceextinfo->name=(char *)malloc(strlen(this_serviceextinfo->name)+1);
! 		if(new_serviceextinfo->name!=NULL)
! 			strcpy(new_serviceextinfo->name,this_serviceextinfo->name);
! 	        }
! 	if(this_serviceextinfo->service_description!=NULL){
! 		new_serviceextinfo->service_description=(char *)malloc(strlen(this_serviceextinfo->service_description)+1);
! 		if(new_serviceextinfo->service_description!=NULL)
! 			strcpy(new_serviceextinfo->service_description,this_serviceextinfo->service_description);
! 	        }
! 	if(this_serviceextinfo->hostgroup!=NULL){
! 		new_serviceextinfo->hostgroup=(char *)malloc(strlen(this_serviceextinfo->hostgroup)+1);
! 		if(new_serviceextinfo->hostgroup!=NULL)
! 			strcpy(new_serviceextinfo->hostgroup,this_serviceextinfo->hostgroup);
! 	        }
! 	if(this_serviceextinfo->notes_url!=NULL){
! 		new_serviceextinfo->notes_url=(char *)malloc(strlen(this_serviceextinfo->notes_url)+1);
! 		if(new_serviceextinfo->notes_url!=NULL)
! 			strcpy(new_serviceextinfo->notes_url,this_serviceextinfo->notes_url);
! 	        }
! 	if(this_serviceextinfo->icon_image!=NULL){
! 		new_serviceextinfo->icon_image=(char *)malloc(strlen(this_serviceextinfo->icon_image)+1);
! 		if(new_serviceextinfo->icon_image!=NULL)
! 			strcpy(new_serviceextinfo->icon_image,this_serviceextinfo->icon_image);
! 	        }
! 	if(this_serviceextinfo->icon_image_alt!=NULL){
! 		new_serviceextinfo->icon_image_alt=(char *)malloc(strlen(this_serviceextinfo->icon_image_alt)+1);
! 		if(new_serviceextinfo->icon_image_alt!=NULL)
! 			strcpy(new_serviceextinfo->icon_image_alt,this_serviceextinfo->icon_image_alt);
! 	        }
  
  	/* add new object to head of list */
--- 949,968 ----
  
  	/* duplicate strings (host_name member is passed in) */
! 	if(host_name!=NULL)
! 		new_serviceextinfo->host_name=strdup(host_name);
! 	if(this_serviceextinfo->template!=NULL)
! 		new_serviceextinfo->template=strdup(this_serviceextinfo->template);
! 	if(this_serviceextinfo->name!=NULL)
! 		new_serviceextinfo->name=strdup(this_serviceextinfo->name);
! 	if(this_serviceextinfo->service_description!=NULL)
! 		new_serviceextinfo->service_description=strdup(this_serviceextinfo->service_description);
! 	if(this_serviceextinfo->hostgroup!=NULL)
! 		new_serviceextinfo->hostgroup=strdup(this_serviceextinfo->hostgroup);
! 	if(this_serviceextinfo->notes_url!=NULL)
! 		new_serviceextinfo->notes_url=strdup(this_serviceextinfo->notes_url);
! 	if(this_serviceextinfo->icon_image!=NULL)
! 		new_serviceextinfo->icon_image=strdup(this_serviceextinfo->icon_image);
! 	if(this_serviceextinfo->icon_image_alt!=NULL)
! 		new_serviceextinfo->icon_image_alt=strdup(this_serviceextinfo->icon_image_alt);
  
  	/* add new object to head of list */
***************
*** 1115,1153 ****
  
  	/* apply missing properties from template hostextinfo... */
! 	if(this_hostextinfo->name==NULL && template_hostextinfo->name!=NULL){
! 		this_hostextinfo->name=(char *)malloc(strlen(template_hostextinfo->name)+1);
! 		if(this_hostextinfo->name!=NULL)
! 			strcpy(this_hostextinfo->name,template_hostextinfo->name);
! 	        }
! 	if(this_hostextinfo->host_name==NULL && template_hostextinfo->host_name!=NULL){
! 		this_hostextinfo->host_name=(char *)malloc(strlen(template_hostextinfo->host_name)+1);
! 		if(this_hostextinfo->host_name!=NULL)
! 			strcpy(this_hostextinfo->host_name,template_hostextinfo->host_name);
! 	        }
! 	if(this_hostextinfo->notes_url==NULL && template_hostextinfo->notes_url!=NULL){
! 		this_hostextinfo->notes_url=(char *)malloc(strlen(template_hostextinfo->notes_url)+1);
! 		if(this_hostextinfo->notes_url!=NULL)
! 			strcpy(this_hostextinfo->notes_url,template_hostextinfo->notes_url);
! 	        }
! 	if(this_hostextinfo->icon_image==NULL && template_hostextinfo->icon_image!=NULL){
! 		this_hostextinfo->icon_image=(char *)malloc(strlen(template_hostextinfo->icon_image)+1);
! 		if(this_hostextinfo->icon_image!=NULL)
! 			strcpy(this_hostextinfo->icon_image,template_hostextinfo->icon_image);
! 	        }
! 	if(this_hostextinfo->icon_image_alt==NULL && template_hostextinfo->icon_image_alt!=NULL){
! 		this_hostextinfo->icon_image_alt=(char *)malloc(strlen(template_hostextinfo->icon_image_alt)+1);
! 		if(this_hostextinfo->icon_image_alt!=NULL)
! 			strcpy(this_hostextinfo->icon_image_alt,template_hostextinfo->icon_image_alt);
! 	        }
! 	if(this_hostextinfo->vrml_image==NULL && template_hostextinfo->vrml_image!=NULL){
! 		this_hostextinfo->vrml_image=(char *)malloc(strlen(template_hostextinfo->vrml_image)+1);
! 		if(this_hostextinfo->vrml_image!=NULL)
! 			strcpy(this_hostextinfo->vrml_image,template_hostextinfo->vrml_image);
! 	        }
! 	if(this_hostextinfo->gd2_image==NULL && template_hostextinfo->gd2_image!=NULL){
! 		this_hostextinfo->gd2_image=(char *)malloc(strlen(template_hostextinfo->gd2_image)+1);
! 		if(this_hostextinfo->gd2_image!=NULL)
! 			strcpy(this_hostextinfo->gd2_image,template_hostextinfo->gd2_image);
! 	        }
  	if(this_hostextinfo->have_2d_coords==FALSE && template_hostextinfo->have_2d_coords==TRUE){
  		this_hostextinfo->x_2d=template_hostextinfo->x_2d;
--- 1040,1057 ----
  
  	/* apply missing properties from template hostextinfo... */
! 	if(this_hostextinfo->name==NULL && template_hostextinfo->name!=NULL)
! 		this_hostextinfo->name=strdup(template_hostextinfo->name);
! 	if(this_hostextinfo->host_name==NULL && template_hostextinfo->host_name!=NULL)
! 		this_hostextinfo->host_name=strdup(template_hostextinfo->host_name);
! 	if(this_hostextinfo->notes_url==NULL && template_hostextinfo->notes_url!=NULL)
! 		this_hostextinfo->notes_url=strdup(template_hostextinfo->notes_url);
! 	if(this_hostextinfo->icon_image==NULL && template_hostextinfo->icon_image!=NULL)
! 		this_hostextinfo->icon_image=strdup(template_hostextinfo->icon_image);
! 	if(this_hostextinfo->icon_image_alt==NULL && template_hostextinfo->icon_image_alt!=NULL)
! 		this_hostextinfo->icon_image_alt=strdup(template_hostextinfo->icon_image_alt);
! 	if(this_hostextinfo->vrml_image==NULL && template_hostextinfo->vrml_image!=NULL)
! 		this_hostextinfo->vrml_image=strdup(template_hostextinfo->vrml_image);
! 	if(this_hostextinfo->gd2_image==NULL && template_hostextinfo->gd2_image!=NULL)
! 		this_hostextinfo->gd2_image=strdup(template_hostextinfo->gd2_image);
  	if(this_hostextinfo->have_2d_coords==FALSE && template_hostextinfo->have_2d_coords==TRUE){
  		this_hostextinfo->x_2d=template_hostextinfo->x_2d;
***************
*** 1198,1231 ****
  
  	/* apply missing properties from template serviceextinfo... */
! 	if(this_serviceextinfo->name==NULL && template_serviceextinfo->name!=NULL){
! 		this_serviceextinfo->name=(char *)malloc(strlen(template_serviceextinfo->name)+1);
! 		if(this_serviceextinfo->name!=NULL)
! 			strcpy(this_serviceextinfo->name,template_serviceextinfo->name);
! 	        }
! 	if(this_serviceextinfo->host_name==NULL && template_serviceextinfo->host_name!=NULL){
! 		this_serviceextinfo->host_name=(char *)malloc(strlen(template_serviceextinfo->host_name)+1);
! 		if(this_serviceextinfo->host_name!=NULL)
! 			strcpy(this_serviceextinfo->host_name,template_serviceextinfo->host_name);
! 	        }
! 	if(this_serviceextinfo->service_description==NULL && template_serviceextinfo->service_description!=NULL){
! 		this_serviceextinfo->service_description=(char *)malloc(strlen(template_serviceextinfo->service_description)+1);
! 		if(this_serviceextinfo->service_description!=NULL)
! 			strcpy(this_serviceextinfo->service_description,template_serviceextinfo->service_description);
! 	        }
! 	if(this_serviceextinfo->notes_url==NULL && template_serviceextinfo->notes_url!=NULL){
! 		this_serviceextinfo->notes_url=(char *)malloc(strlen(template_serviceextinfo->notes_url)+1);
! 		if(this_serviceextinfo->notes_url!=NULL)
! 			strcpy(this_serviceextinfo->notes_url,template_serviceextinfo->notes_url);
! 	        }
! 	if(this_serviceextinfo->icon_image==NULL && template_serviceextinfo->icon_image!=NULL){
! 		this_serviceextinfo->icon_image=(char *)malloc(strlen(template_serviceextinfo->icon_image)+1);
! 		if(this_serviceextinfo->icon_image!=NULL)
! 			strcpy(this_serviceextinfo->icon_image,template_serviceextinfo->icon_image);
! 	        }
! 	if(this_serviceextinfo->icon_image_alt==NULL && template_serviceextinfo->icon_image_alt!=NULL){
! 		this_serviceextinfo->icon_image_alt=(char *)malloc(strlen(template_serviceextinfo->icon_image_alt)+1);
! 		if(this_serviceextinfo->icon_image_alt!=NULL)
! 			strcpy(this_serviceextinfo->icon_image_alt,template_serviceextinfo->icon_image_alt);
! 	        }
  
  #ifdef DEBUG0
--- 1102,1117 ----
  
  	/* apply missing properties from template serviceextinfo... */
! 	if(this_serviceextinfo->name==NULL && template_serviceextinfo->name!=NULL)
! 		this_serviceextinfo->name=strdup(template_serviceextinfo->name);
! 	if(this_serviceextinfo->host_name==NULL && template_serviceextinfo->host_name!=NULL)
! 		this_serviceextinfo->host_name=strdup(template_serviceextinfo->host_name);
! 	if(this_serviceextinfo->service_description==NULL && template_serviceextinfo->service_description!=NULL)
! 		this_serviceextinfo->service_description=strdup(template_serviceextinfo->service_description);
! 	if(this_serviceextinfo->notes_url==NULL && template_serviceextinfo->notes_url!=NULL)
! 		this_serviceextinfo->notes_url=strdup(template_serviceextinfo->notes_url);
! 	if(this_serviceextinfo->icon_image==NULL && template_serviceextinfo->icon_image!=NULL)
! 		this_serviceextinfo->icon_image=strdup(template_serviceextinfo->icon_image);
! 	if(this_serviceextinfo->icon_image_alt==NULL && template_serviceextinfo->icon_image_alt!=NULL)
! 		this_serviceextinfo->icon_image_alt=strdup(template_serviceextinfo->icon_image_alt);
  
  #ifdef DEBUG0

Index: xodtemplate.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** xodtemplate.c	14 Jun 2002 04:39:24 -0000	1.16
--- xodtemplate.c	20 Aug 2002 02:43:19 -0000	1.17
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 06-13-2002
   *
   * Description:
--- 4,8 ----
   *
   * Copyright (c) 2001-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 08-19-2002
   *
[...3943 lines suppressed...]
! 				/* save the host name */
! 				new_list->host_name=strdup(temp_host->host_name);
! 				if(new_list->host_name==NULL){
! 					free(host_names);
! 					return temp_list;
! 	                                }
! 
! 				/* add new item to head of list */
! 				new_list->next=temp_list;
! 				temp_list=new_list;
!                                 }
! 	                }
  
  		free(host_names);
  	        }
  
  #ifdef DEBUG0
! 	printf("xodtemplate_expand_hostgroups_and_hosts() end\n");
  #endif
  

Index: xodtemplate.h
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** xodtemplate.h	29 May 2002 04:39:21 -0000	1.6
--- xodtemplate.h	20 Aug 2002 02:43:19 -0000	1.7
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2002 Ethan Galstad (na...@na...)
!  * Last Modified:   05-28-2002
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2001-2002 Ethan Galstad (na...@na...)
!  * Last Modified:   08-19-2002
   *
   * License:
***************
*** 313,318 ****
--- 313,320 ----
  	int        _start_line;
  
+ 	char       *hostgroup_name;
  	char       *host_name;
  	char       *service_description;
+ 	char       *dependent_hostgroup_name;
  	char       *dependent_host_name;
  	char       *dependent_service_description;
***************
*** 367,370 ****
--- 369,374 ----
  	int        _start_line;
  
+ 	char      *hostgroup_name;
+ 	char      *dependent_hostgroup_name;
  	char      *host_name;
  	char      *dependent_host_name;
***************
*** 422,426 ****
  void xodtemplate_strip(char *);
  
! xodtemplate_hostlist *xodtemplate_expand_hostgroups(char *);
  int xodtemplate_free_hostlist(xodtemplate_hostlist *);
  
--- 426,430 ----
  void xodtemplate_strip(char *);
  
! xodtemplate_hostlist *xodtemplate_expand_hostgroups_and_hosts(char *,char *);
  int xodtemplate_free_hostlist(xodtemplate_hostlist *);
  
***************
*** 438,441 ****
--- 442,447 ----
  int xodtemplate_duplicate_hostescalation(xodtemplate_hostescalation *,char *);
  int xodtemplate_duplicate_serviceescalation(xodtemplate_serviceescalation *,char *,char *);
+ int xodtemplate_duplicate_hostdependency(xodtemplate_hostdependency *,char *,char *);
+ int xodtemplate_duplicate_servicedependency(xodtemplate_servicedependency *,char *,char *,char *,char *);
  
  int xodtemplate_resolve_timeperiod(xodtemplate_timeperiod *);
***************
*** 462,465 ****
--- 468,472 ----
  xodtemplate_contact *xodtemplate_find_contact(char *);
  xodtemplate_host *xodtemplate_find_host(char *);
+ xodtemplate_host *xodtemplate_find_real_host(char *);
  xodtemplate_service *xodtemplate_find_service(char *);
  xodtemplate_hostdependency *xodtemplate_find_hostdependency(char *);