[Nagios-checkins] nagios/base config.c,1.56,1.57

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

Update of /cvsroot/nagios/nagios/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1992/base

Modified Files:
	config.c 
Log Message:
Bug fix for non-registered objects in wildcard/regex template logic

Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/config.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** config.c	23 Dec 2005 19:31:36 -0000	1.56
--- config.c	23 Dec 2005 20:20:00 -0000	1.57
***************
*** 2377,2381 ****
  		temp_service=find_service(temp_sd->dependent_host_name,temp_sd->dependent_service_description);
  		if(temp_service==NULL){
! 			snprintf(temp_buffer,sizeof(temp_buffer),"Error: Dependent service specified in service dependency for service '%s' on host '%s' is not defined anywhere!",temp_sd->dependent_service_description,temp_sd->dependent_host_name);
  			temp_buffer[sizeof(temp_buffer)-1]='\x0';
  			write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_ERROR,TRUE);
--- 2377,2381 ----
  		temp_service=find_service(temp_sd->dependent_host_name,temp_sd->dependent_service_description);
  		if(temp_service==NULL){
! 			snprintf(temp_buffer,sizeof(temp_buffer),"Error: Dependent service '%s' on host '%s' specified in service dependency for service '%s' on host '%s' is not defined anywhere!",temp_sd->dependent_service_description,temp_sd->dependent_host_name,temp_sd->service_description,temp_sd->host_name);
  			temp_buffer[sizeof(temp_buffer)-1]='\x0';
  			write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_ERROR,TRUE);
***************
*** 2386,2390 ****
  		temp_service2=find_service(temp_sd->host_name,temp_sd->service_description);
  		if(temp_service2==NULL){
! 			snprintf(temp_buffer,sizeof(temp_buffer),"Error: Service specified in service dependency for service '%s' on host '%s' is not defined anywhere!",temp_sd->dependent_service_description,temp_sd->dependent_host_name);
  			temp_buffer[sizeof(temp_buffer)-1]='\x0';
  			write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_ERROR,TRUE);
--- 2386,2390 ----
  		temp_service2=find_service(temp_sd->host_name,temp_sd->service_description);
  		if(temp_service2==NULL){
! 			snprintf(temp_buffer,sizeof(temp_buffer),"Error: Service '%s' on host '%s' specified in service dependency for service '%s' on host '%s' is not defined anywhere!",temp_sd->service_description,temp_sd->host_name,temp_sd->dependent_service_description,temp_sd->dependent_host_name);
  			temp_buffer[sizeof(temp_buffer)-1]='\x0';
  			write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_ERROR,TRUE);