[Nagios-checkins] CVS: nagios/common objects.c,1.10,1.11

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

Update of /cvsroot/nagios/nagios/common
In directory sc8-pr-cvs1:/tmp/cvs-serv5262/common

Modified Files:
	objects.c 
Log Message:
Added support for umultiple service descriptions in service dependencies and escalation

Index: objects.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** objects.c	11 Dec 2002 05:30:10 -0000	1.10
--- objects.c	13 Dec 2002 23:42:01 -0000	1.11
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
!  * Last Modified:   12-10-2002
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
!  * Last Modified:   12-12-2002
   *
   * License:
***************
*** 831,834 ****
--- 831,835 ----
  	new_host->parent_hosts=NULL;
  	new_host->max_attempts=max_attempts;
+ 	new_host->contact_groups=NULL;
  	new_host->notification_interval=notification_interval;
  	new_host->notify_on_recovery=(notify_up>0)?TRUE:FALSE;
***************
*** 4085,4088 ****
--- 4086,4091 ----
  			while(this_host!=NULL){
  
+ 				next_host=this_host->next;
+ 
  				/* free memory for parent hosts */
  				this_hostsmember=this_host->parent_hosts;
***************
*** 4103,4107 ****
  				        }
  
- 				next_host=this_host->next;
  				free(this_host->name);
  				free(this_host->alias);
--- 4106,4109 ----
***************
*** 4229,4232 ****
--- 4231,4236 ----
  			while(this_service!=NULL){
  
+ 				next_service=this_service->next;
+ 
  				/* free memory for contact groups */
  				this_contactgroupsmember=this_service->contact_groups;
***************
*** 4238,4242 ****
  				        }
  
- 				next_service=this_service->next;
  				free(this_service->host_name);
  				free(this_service->description);
--- 4242,4245 ----