Child processes that die now result in critical states, prep for new version

Changelog

@@ -4,9 +4,10 @@ NRPE Changelog
 
 
 
-2.10 - ??/??/2007
+2.10 - 10/19/2007
 -----------------
 - Moved PDF docs to docs/ subdirectory, added OpenOffice source document
+- A critical result is now returned for child processed that die due to a signal (Klas Lindfors) 
 
 
 

configure

@@ -1296,9 +1296,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 PKG_NAME=nrpe
-PKG_VERSION="2.9"
+PKG_VERSION="2.10"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="08-13-2007"
+PKG_REL_DATE="10-19-2007"
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do

configure.in

@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/nagios)
 
 PKG_NAME=nrpe
-PKG_VERSION="2.9"
+PKG_VERSION="2.10"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="08-13-2007"
+PKG_REL_DATE="10-19-2007"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL

include/common.h

@@ -2,7 +2,7 @@
  *
  * COMMON.H - NRPE Common Include File
  * Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 08-13-2007
+ * Last Modified: 10-19-2007
  *
  * License:
  *
@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#define PROGRAM_VERSION "2.9"
-#define MODIFICATION_DATE "08-13-2007"
+#define PROGRAM_VERSION "2.10"
+#define MODIFICATION_DATE "10-19-2007"
 
 #define OK		0
 #define ERROR		-1

include/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
-		0xBD,0x3F,0xF2,0xBB,0x91,0x8A,0x6D,0x31,0xF8,0xD2,0xBE,0xA1,
-		0x43,0x40,0x5D,0xAD,0x66,0xC6,0x83,0x16,0xC7,0x7F,0xD3,0x13,
-		0xC6,0x15,0xB0,0x4B,0x98,0x8E,0xF1,0x65,0x4E,0x30,0x24,0x27,
-		0x6D,0xCA,0x0D,0x23,0x52,0x19,0x2E,0x56,0xFA,0x3F,0x53,0x6A,
-		0x58,0x08,0xB8,0x6A,0x30,0x14,0xF2,0x65,0x12,0x4F,0xD8,0x74,
-		0x1E,0x82,0x4F,0x3B,
+		0x8A,0xA6,0xF0,0xEF,0x5E,0x6E,0x71,0x62,0x1A,0x5F,0xE7,0xA8,
+		0xF8,0x81,0xD3,0x28,0x7E,0x4A,0x57,0x35,0xE3,0x55,0x72,0x9F,
+		0x0F,0xB8,0x39,0x5F,0x80,0x5B,0xA6,0x38,0xB9,0xAB,0xE6,0xCD,
+		0x9A,0x08,0x3E,0x8D,0xE2,0xB4,0xFB,0xC9,0x2B,0x74,0x36,0xD5,
+		0x0E,0x41,0x3F,0x6B,0x99,0xA5,0xB4,0x8E,0x09,0xC2,0x5E,0x81,
+		0xB5,0xB9,0x71,0x93,
 		};
 	static unsigned char dh512_g[]={
 		0x02,

nrpe.spec

@@ -1,5 +1,5 @@
 %define name nrpe
-%define version 2.9
+%define version 2.10
 %define release 1
 %define nsusr nagios
 %define nsgrp nagios

src/check_nrpe.c

@@ -4,7 +4,7 @@
  * Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
  * License: GPL
  *
- * Last Modified: 08-13-2007
+ * Last Modified: 10-19-2007
  *
  * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
  *

src/nrpe.c

@@ -4,7 +4,7 @@
  * Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
  * License: GPL
  *
- * Last Modified: 08-13-2007
+ * Last Modified: 10-19-2007
  *
  * Command line: nrpe -c <config_file> [--inetd | --daemon]
  *
@@ -1343,6 +1343,9 @@ int my_system(char *command,int timeout,int *early_timeout,char *output,int outp
 			/* report an error if we couldn't close the command */
 			if(status==-1)
 				result=STATE_CRITICAL;
+			/* report an error if child died due to signal (Klas Lindfors) */
+			else if(!WIFEXITED(status))
+				result=STATE_CRITICAL;
 			else
 				result=WEXITSTATUS(status);
 		        }

update-version

@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=2.9
+CURRENTVERSION=2.10
 
 # Last date
-LASTDATE=08-13-2007
+LASTDATE=10-19-2007
 
 if [ "x$1" = "x" ]
 then