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

[openssh.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 32764f0926c51b196dd8627d18e360aa16bf92a2..d07fd4fe75cf9de3722c3f4a3e308e8806b609ad 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -24,24 +24,15 @@
 /* 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 using the Dante SOCKS library. */
-#undef HAVE_DANTE
-
-/* Define if using the Socks4 SOCKS library. */
-#undef HAVE_SOCKS4
-
-/* Define if using the Socks5 SOCKS library. */
-#undef HAVE_SOCKS5
+/* 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 <ssl/header.h>  */
-#undef HAVE_SSL
-
 /* Define if your ssl headers are included with #include <openssl/header.h>  */
 #undef HAVE_OPENSSL
 
@@ -110,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
@@ -159,6 +153,23 @@
 /* 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 ************** */