Sfoglia il codice sorgente

Fix for C++ style comment under AIX

Ethan Galstad 19 anni fa
parent
commit
6ff0a0408c
3 ha cambiato i file con 15 aggiunte e 8 eliminazioni
  1. 6 0
      Changelog
  2. 6 6
      include/dh.h
  3. 3 2
      src/check_nrpe.c

+ 6 - 0
Changelog

@@ -2,6 +2,12 @@
 NRPE Changelog
 **************
 
+
+2.7.1 - 03/??/2007
+------------------
+- Changed C++ style comment to C style to fix compilation errors on AIX (Ryan McGarry)
+
+
 2.7 - 02/18/2007
 ----------------
 - Patches for detection SSL header and library locations (Andrew Boyce-Lewis)

+ 6 - 6
include/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
-		0xB9,0xBD,0x35,0x0C,0xD1,0xE9,0x25,0x3F,0x88,0x0E,0x29,0x73,
-		0x6D,0x08,0xDB,0x75,0x5B,0x7A,0x43,0x2D,0x2A,0x73,0x55,0x94,
-		0xA2,0xC0,0x90,0xB5,0xE5,0x0D,0xB1,0x62,0x95,0x32,0xA7,0x6E,
-		0xC8,0x75,0x1E,0x30,0x0E,0x70,0xC3,0x5D,0x99,0xF9,0x6A,0xA5,
-		0xC2,0x0C,0x26,0xD5,0xC3,0x14,0x71,0x12,0x6E,0x7D,0x91,0x86,
-		0xED,0x73,0x29,0x63,
+		0xD5,0x3F,0x5B,0x7D,0x68,0xC5,0xC1,0x1A,0x5E,0x52,0x50,0x32,
+		0xCA,0x47,0xA4,0x1F,0x54,0x64,0xCF,0x6F,0x10,0xC6,0x1E,0x40,
+		0xA2,0xD0,0x24,0x84,0xD2,0x61,0xE9,0x5E,0x5B,0xAA,0x0B,0xF0,
+		0xFB,0x51,0x2B,0xCC,0x97,0x17,0xB2,0x78,0xF8,0x6C,0xA3,0xB4,
+		0xDA,0xAD,0x47,0xB3,0x1F,0x69,0xEC,0x3A,0xD0,0xA3,0xC9,0x6E,
+		0x69,0x8B,0x48,0x03,
 		};
 	static unsigned char dh512_g[]={
 		0x02,

+ 3 - 2
src/check_nrpe.c

@@ -4,7 +4,7 @@
  * Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
  * License: GPL
  *
- * Last Modified: 02-19-2007
+ * Last Modified: 03-07-2007
  *
  * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
  *
@@ -434,7 +434,8 @@ int graceful_close(int sd, int timeout){
         struct timeval tv;
         char buf[1000];
 
-        shutdown(sd,SHUT_WR);  // Send FIN packet
+	/* send FIN packet */
+        shutdown(sd,SHUT_WR);  
         for(;;){
 
                 FD_ZERO(&in);