4
0
Эх сурвалжийг харах

Typo fixes and int type includes

Ethan Galstad 23 жил өмнө
parent
commit
9af71ae2a6
4 өөрчлөгдсөн 24 нэмэгдсэн , 15 устгасан
  1. 10 1
      common/config.h.in
  2. 4 4
      configure
  3. 4 4
      configure.in
  4. 6 6
      src/dh.h

+ 10 - 1
common/config.h.in

@@ -2,7 +2,7 @@
  *
  *
  * NRPE Common Header File
  * NRPE Common Header File
  * Copyright (c) 1999-2003 Ethan Galstad (nagios@nagios.org)
  * Copyright (c) 1999-2003 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 06-12-2003
+ * Last Modified: 06-19-2003
  *
  *
  * License:
  * License:
  *
  *
@@ -219,5 +219,14 @@ typedef int int32_t;
 #include <krb5.h>
 #include <krb5.h>
 #endif
 #endif
 
 
+#undef HAVE_INTTYPES_H
+#undef HAVE_STDINT_H
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#endif
 
 
 #endif
 #endif

+ 4 - 4
configure

@@ -1136,7 +1136,7 @@ EOF
 
 
 fi
 fi
 
 
-for ac_hdr in ctype.h dirent.h errno.h fcntl.h getopt.h grp.h netdb.h pwd.h signal.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h
+for ac_hdr in ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h
 do
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1717,7 +1717,7 @@ EOF
 fi
 fi
 
 
 if test "$ac_cv_type_u_int32_t" = no ; then
 if test "$ac_cv_type_u_int32_t" = no ; then
-	if test "$ac_cv_type_int32_t" = yes ; then
+	if test "$ac_cv_type_u_int32_t" = yes ; then
 		cat >> confdefs.h <<\EOF
 		cat >> confdefs.h <<\EOF
 #define U_INT32_T_IS_UINT32_T 1
 #define U_INT32_T_IS_UINT32_T 1
 EOF
 EOF
@@ -2028,7 +2028,7 @@ echo "configure:2014: checking for SSL" >&5
 
 
 	if test x_$found_ssl != x_yes; then
 	if test x_$found_ssl != x_yes; then
         	{ echo "configure: error: Cannot find ssl libraries" 1>&2; exit 1; }
         	{ echo "configure: error: Cannot find ssl libraries" 1>&2; exit 1; }
-	    else
+	else
 	        printf "SSL found in $ssldir\n";
 	        printf "SSL found in $ssldir\n";
 	        LIBS="$LIBS -lssl -lcrypto";
 	        LIBS="$LIBS -lssl -lcrypto";
 		if test x$ssl_lib_dir != x; then
 		if test x$ssl_lib_dir != x; then
@@ -2050,7 +2050,7 @@ EOF
 			sslbin=$ssldir/bin/openssl
 			sslbin=$ssldir/bin/openssl
 		fi
 		fi
 		$sslbin dhparam -out /dev/null -C 512 > src/dh.h
 		$sslbin dhparam -out /dev/null -C 512 > src/dh.h
-	    fi
+	fi
 
 
 		echo $ac_n "checking for Kerberos include files""... $ac_c" 1>&6
 		echo $ac_n "checking for Kerberos include files""... $ac_c" 1>&6
 echo "configure:2057: checking for Kerberos include files" >&5
 echo "configure:2057: checking for Kerberos include files" >&5

+ 4 - 4
configure.in

@@ -26,7 +26,7 @@ dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h netdb.h pwd.h signal.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
+AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
 
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_CONST
@@ -46,7 +46,7 @@ dnl Define u_int32_t if we don't have it already (Solaris, etc.)
 AC_CHECK_TYPE(uint32_t,unsigned int)
 AC_CHECK_TYPE(uint32_t,unsigned int)
 AC_CHECK_TYPE(u_int32_t,unsigned int)
 AC_CHECK_TYPE(u_int32_t,unsigned int)
 if test "$ac_cv_type_u_int32_t" = no ; then
 if test "$ac_cv_type_u_int32_t" = no ; then
-	if test "$ac_cv_type_int32_t" = yes ; then
+	if test "$ac_cv_type_u_int32_t" = yes ; then
 		AC_DEFINE(U_INT32_T_IS_UINT32_T)
 		AC_DEFINE(U_INT32_T_IS_UINT32_T)
 	else
 	else
 		if test "$ac_cv_sizeof_int" = 4 ; then
 		if test "$ac_cv_sizeof_int" = 4 ; then
@@ -138,7 +138,7 @@ if test x$check_for_ssl = xyes; then
 
 
 	if test x_$found_ssl != x_yes; then
 	if test x_$found_ssl != x_yes; then
         	AC_MSG_ERROR(Cannot find ssl libraries)
         	AC_MSG_ERROR(Cannot find ssl libraries)
-	    else
+	else
 	        printf "SSL found in $ssldir\n";
 	        printf "SSL found in $ssldir\n";
 	        LIBS="$LIBS -lssl -lcrypto";
 	        LIBS="$LIBS -lssl -lcrypto";
 		if test x$ssl_lib_dir != x; then
 		if test x$ssl_lib_dir != x; then
@@ -158,7 +158,7 @@ if test x$check_for_ssl = xyes; then
 			sslbin=$ssldir/bin/openssl
 			sslbin=$ssldir/bin/openssl
 		fi
 		fi
 		$sslbin dhparam -out /dev/null -C 512 > src/dh.h
 		$sslbin dhparam -out /dev/null -C 512 > src/dh.h
-	    fi
+	fi
 
 
 	dnl RedHat 8.0 and 9.0 include openssl compiled with kerberos, so we must include header file
 	dnl RedHat 8.0 and 9.0 include openssl compiled with kerberos, so we must include header file
 	AC_MSG_CHECKING(for Kerberos include files)
 	AC_MSG_CHECKING(for Kerberos include files)

+ 6 - 6
src/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 DH *get_dh512()
 	{
 	{
 	static unsigned char dh512_p[]={
 	static unsigned char dh512_p[]={
-		0xF2,0xBB,0xC1,0x35,0x68,0xF3,0x1F,0x4A,0x9C,0x64,0x85,0xC8,
-		0xEB,0x9F,0x32,0xA8,0xA8,0x39,0x9B,0x5C,0x4E,0x62,0xA5,0x90,
-		0x24,0x37,0x2D,0x03,0xAD,0x8C,0x23,0x76,0xE9,0x5F,0x19,0xC8,
-		0xCB,0xC5,0xF6,0xE1,0xEA,0x40,0x06,0xBC,0x24,0xA3,0x07,0x07,
-		0xE1,0xE9,0x2A,0x33,0x67,0x42,0xAE,0x0D,0x20,0x74,0x87,0x93,
-		0x34,0xA7,0xBA,0xFB,
+		0xA8,0xB7,0xDD,0xA4,0xF1,0x04,0xC7,0x59,0xE5,0x64,0x96,0xA7,
+		0x66,0xDF,0xB4,0x01,0xCB,0xCD,0xB0,0xB0,0x1E,0x4E,0xFE,0x79,
+		0x6F,0xD1,0xF8,0x95,0xD6,0xA6,0x74,0x7F,0x78,0x35,0x04,0x26,
+		0x26,0xD0,0x01,0x6C,0x0C,0x3B,0x2E,0xCA,0x2E,0x21,0x5F,0x78,
+		0x84,0xF7,0x36,0xB6,0x00,0x73,0xAF,0x66,0xF0,0xD7,0x3D,0xBD,
+		0xFD,0x29,0x8A,0x83,
 		};
 		};
 	static unsigned char dh512_g[]={
 	static unsigned char dh512_g[]={
 		0x02,
 		0x02,