[Nagios-checkins] nagios/base checks.c, 1.158, 1.159 nagios.c, 1.146, 1.147 nagiostats.c, 1.53, 1.54

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

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

Modified Files:
	checks.c nagios.c nagiostats.c 
Log Message:
Prep for new release

Index: nagiostats.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/nagiostats.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** nagiostats.c	17 Dec 2007 17:51:52 -0000	1.53
--- nagiostats.c	29 Jan 2008 16:05:34 -0000	1.54
***************
*** 4,12 ****
   *
   * Program: Nagiostats
!  * Version: 3.0rc1
   * License: GPL
   * Copyright (c) 2003-2007 Ethan Galstad (na...@na...)
   *
!  * Last Modified:   12-17-2007
   *
   * License:
--- 4,12 ----
   *
   * Program: Nagiostats
!  * Version: 3.0rc2
   * License: GPL
   * Copyright (c) 2003-2007 Ethan Galstad (na...@na...)
   *
!  * Last Modified:   01-29-2008
   *
   * License:

Index: nagios.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/nagios.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** nagios.c	9 Jan 2008 17:51:21 -0000	1.146
--- nagios.c	29 Jan 2008 16:05:34 -0000	1.147
***************
*** 4,13 ****
   *
   * Program: Nagios
!  * Version: 3.0rc1
   * License: GPL
   * Copyright (c) 1999-2007 Ethan Galstad (http://www.nagios.org)
   *
   * First Written:   01-28-1999 (start of development)
!  * Last Modified:   01-08-2008
   *
   * Description:
--- 4,13 ----
   *
   * Program: Nagios
!  * Version: 3.0rc2
   * License: GPL
   * Copyright (c) 1999-2007 Ethan Galstad (http://www.nagios.org)
   *
   * First Written:   01-28-1999 (start of development)
!  * Last Modified:   01-29-2008
   *
   * Description:

Index: checks.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/checks.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** checks.c	24 Jan 2008 16:04:37 -0000	1.158
--- checks.c	29 Jan 2008 16:05:33 -0000	1.159
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2008 Ethan Galstad (na...@na...)
!  * Last Modified: 01-24-2008
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2008 Ethan Galstad (na...@na...)
!  * Last Modified: 01-28-2008
   *
   * License:
***************
*** 382,387 ****
  		}
  
! 	/* neb module wants to override the service check - perhaps it will check the service itself */
  	/* NOTE: if a module does this, it has to do a lot of the stuff found below to make sure things don't get whacked out of shape! */
  	if(neb_result==NEBERROR_CALLBACKOVERRIDE)
  		return OK;
--- 382,388 ----
  		}
  
! 	/* neb module wants to override (or cancel) the service check - perhaps it will check the service itself */
  	/* NOTE: if a module does this, it has to do a lot of the stuff found below to make sure things don't get whacked out of shape! */
+ 	/* NOTE: if would be easier for modules to override checks when the NEBTYPE_SERVICECHECK_INITIATE event is called (later) */
  	if(neb_result==NEBERROR_CALLBACKOVERRIDE)
  		return OK;
***************
*** 411,414 ****
--- 412,416 ----
  		if(preferred_time)
  			*preferred_time+=(svc->check_interval*interval_length);
+ 		svc->latency=old_latency;
  		return ERROR;
  		}
***************
*** 420,423 ****
--- 422,427 ----
  		if(preferred_time)
  			*preferred_time+=(svc->check_interval*interval_length);
+ 		svc->latency=old_latency;
+ 		my_free(raw_command);
  		return ERROR;
  		}