- Integrate Andre Lucas' <andre.lucas@dial.pipex.com> entropy collection

[openssh.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 3b37c59466f2c40bff36f240286113e184c34481..d07fd4fe75cf9de3722c3f4a3e308e8806b609ad 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,14 +1,17 @@
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
 /* Generated automatically from acconfig.h by autoheader. */
 /* Please make your changes there */
 
 @TOP@
 
-/* SSL directory.  */
-#undef ssldir
-
 /* Define if you want to disable PAM support */
 #undef DISABLE_PAM
 
+/* Define if you want to disable AIX4's authenticate function */
+#undef WITH_AIXAUTHENTICATE
+
 /* Define if you want to disable lastlog support */
 #undef DISABLE_LASTLOG
 
@@ -21,11 +24,14 @@
 /* Location of random number pool  */
 #undef RANDOM_POOL
 
-/* Are we using the Entropy gathering daemon */
-#undef HAVE_EGD
+/* Location of EGD random number socket */
+#undef EGD_SOCKET
 
-/* Define if your ssl headers are included with #include <ssl/header.h>  */
-#undef HAVE_SSL
+/* Builtin PRNG command timeout */
+#undef ENTROPY_TIMEOUT_MSEC
+
+/* Define if you want to install preformatted manpages.*/
+#undef MANTYPE
 
 /* Define if your ssl headers are included with #include <openssl/header.h>  */
 #undef HAVE_OPENSSL
@@ -34,25 +40,17 @@
  * message at run-time. */
 #undef RSAREF
 
-/* Define is utmp.h has a ut_host field */
+/* struct utmp and struct utmpx fields */
 #undef HAVE_HOST_IN_UTMP
-
-/* Define is utmpx.h has a ut_host field */
 #undef HAVE_HOST_IN_UTMPX
-
-/* Define is utmpx.h has a syslen field */
+#undef HAVE_ADDR_IN_UTMP
+#undef HAVE_ADDR_IN_UTMPX
+#undef HAVE_ADDR_V6_IN_UTMP
+#undef HAVE_ADDR_V6_IN_UTMPX
 #undef HAVE_SYSLEN_IN_UTMPX
-
-/* Define is utmp.h has a ut_pid field */
 #undef HAVE_PID_IN_UTMP
-
-/* Define is utmp.h has a ut_type field */
 #undef HAVE_TYPE_IN_UTMP
-
-/* Define is utmp.h has a ut_tv field */
 #undef HAVE_TV_IN_UTMP
-
-/* Define is utmp.h has a ut_id field */
 #undef HAVE_ID_IN_UTMP
 
 /* Define if you want to use utmpx */
@@ -85,6 +83,9 @@
 /* Define if your libraries define daemon() */
 #undef HAVE_DAEMON
 
+/* Define if your libraries define getpagesize() */
+#undef HAVE_GETPAGESIZE
+
 /* Define if xauth is found in your path */
 #undef XAUTH_PATH
 
@@ -100,6 +101,9 @@
 /* Define if you want have trusted HPUX */
 #undef HAVE_HPUX_TRUSTED_SYSTEM_PW
 
+/* Defined if in_systm.h needs to be included with netinet/ip.h (HPUX - <sigh/>) */
+#undef NEED_IN_SYSTM_H
+
 /* Define if you have an old version of PAM which takes only one argument */
 /* to pam_strerror */
 #undef HAVE_OLD_PAM
@@ -108,12 +112,19 @@
 #undef MAIL_DIRECTORY
 
 /* Data types */
-#undef HAVE_QUAD_T
 #undef HAVE_INTXX_T
 #undef HAVE_U_INTXX_T
 #undef HAVE_UINTXX_T
 #undef HAVE_SOCKLEN_T
 #undef HAVE_SIZE_T
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
+#undef HAVE_STRUCT_ADDRINFO
+#undef HAVE_STRUCT_IN6_ADDR
+#undef HAVE_STRUCT_SOCKADDR_IN6
+
+/* Fields in struct sockaddr_storage */
+#undef HAVE_SS_FAMILY_IN_SS
+#undef HAVE___SS_FAMILY_IN_SS
 
 /* Define if you have /dev/ptmx */
 #undef HAVE_DEV_PTMX
@@ -127,11 +138,42 @@
 /* Specify default $PATH */
 #undef USER_PATH
 
-/* Define if the inclusion of crypt.h breaks the build (e.g. Irix 5.x) */
-#undef CRYPT_H_BREAKS_BUILD
+/* Specify location of ssh.pid */
+#undef PIDDIR
+
+/* Use IPv4 for connection by default, IPv6 can still if explicity asked */
+#undef IPV4_DEFAULT
+
+/* getaddrinfo is broken (if present) */
+#undef BROKEN_GETADDRINFO
+
+/* Workaround more Linux IPv6 quirks */
+#undef DONT_TRY_OTHER_AF
+
+/* Detect IPv4 in IPv6 mapped addresses and treat as IPv4 */
+#undef IPV4_IN_IPV6
+
+/* Programs used in entropy collection */
+#undef PROG_LS
+#undef PROG_NETSTAT
+#undef PROG_ARP
+#undef PROG_IFCONFIG
+#undef PROG_PS
+#undef PROG_W
+#undef PROG_WHO
+#undef PROG_LAST
+#undef PROG_LASTLOG
+#undef PROG_DF
+#undef PROG_VMSTAT
+#undef PROG_UPTIME
+#undef PROG_IPCS
+#undef PROG_TAIL
+
 
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */
 
 #include "defines.h"
+
+#endif /* _CONFIG_H */