Bug fixes

Changelog

@@ -3,11 +3,13 @@ NRPE Changelog
 **************
 
 
-2.4 - ??/??/2006
+2.4 - 02/22/2006
 ----------------
 - Added option to allow week random seed (Gerhard Lausser)
 - Added optional command line prefix (Sean Finney)
 - Added ability to reload config file with SIGHUP
+- Fixed bug with location of dh.h include file
+- Fixed bug with disconnect message in debug mode
 
 
 2.3 - 01/23/2006

configure

@@ -6065,7 +6065,7 @@ _ACEOF
 			sslbin=$ssldir/bin/openssl
 		fi
 		# awk to strip off meta data at bottom of dhparam output
-		$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > src/dh.h
+		$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
 	fi
 
 		echo "$as_me:$LINENO: checking for Kerberos include files" >&5
@@ -7261,7 +7261,6 @@ fi
 
 perl subst init-script
 perl subst init-script.debian
-perl subst init-script.freebsd
 perl subst init-script.suse
 perl subst sample-config/nrpe.cfg
 perl subst sample-config/nrpe.xinetd

configure.in

@@ -221,7 +221,7 @@ if test x$check_for_ssl = xyes; then
 			sslbin=$ssldir/bin/openssl
 		fi
 		# awk to strip off meta data at bottom of dhparam output
-		$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > src/dh.h
+		$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
 	fi
 
 	dnl RedHat 8.0 and 9.0 include openssl compiled with kerberos, so we must include header file

include/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
-		0xE9,0xFF,0x32,0x13,0x76,0x3B,0xCC,0x89,0xEC,0xAD,0x06,0xA3,
-		0x0B,0x60,0x0F,0x55,0xBF,0x12,0xD3,0xDB,0x64,0x41,0x25,0xF1,
-		0xF4,0xF9,0xBF,0x37,0x7A,0xB1,0x8F,0xD8,0xCB,0x35,0xD9,0x51,
-		0xC3,0x7B,0x1A,0x63,0xCC,0x4A,0x02,0x7A,0xDF,0xDD,0x74,0x40,
-		0x7E,0x3A,0xA1,0xB0,0x0B,0x51,0xEC,0xBA,0x10,0x19,0x70,0x6B,
-		0xF5,0xDF,0xEC,0xE3,
+		0xF0,0x8F,0x10,0x43,0xFA,0x65,0x06,0xEC,0xDD,0xC2,0x9C,0x0B,
+		0xEE,0x78,0x7F,0x33,0xDD,0xC4,0x02,0xE2,0xDC,0x51,0x05,0x2F,
+		0xF5,0x20,0x6A,0x28,0xA0,0x06,0x07,0x86,0xE4,0x45,0x6D,0xAE,
+		0x77,0x29,0x7C,0x72,0xDC,0x6E,0x02,0x87,0x8A,0x3D,0x43,0xF2,
+		0x3C,0xB8,0x1E,0x18,0xC6,0x40,0x9F,0x0C,0x2B,0x42,0xE1,0x37,
+		0x33,0x03,0xD3,0x5B,
 		};
 	static unsigned char dh512_g[]={
 		0x02,

src/nrpe.c

@@ -811,7 +811,7 @@ void wait_for_connections(void){
 
 				/* log info to syslog facility */
 				if(debug==TRUE)
-					syslog(LOG_DEBUG,"Connection from %s closed.",connecting_host);
+					syslog(LOG_DEBUG,"Connection from %s closed.",inet_ntoa(nptr->sin_addr));
 
 				/* close socket prior to exiting */
 				close(new_sd);