summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.in4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c91d9fcec..48e424965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
4 - (djm) Fully revert PAM session patch (again). All PAM session init is 4 - (djm) Fully revert PAM session patch (again). All PAM session init is
5 now done before the final fork(). 5 now done before the final fork().
6 - (djm) EGD detection patch from Tim Rice <tim@multitalents.net> 6 - (djm) EGD detection patch from Tim Rice <tim@multitalents.net>
7 - (djm) Remove /tmp from EGD socket search list
7 8
820010227 920010227
9 - (bal) Applied shutdown() patch for sftp.c by Corinna Vinschen 10 - (bal) Applied shutdown() patch for sftp.c by Corinna Vinschen
@@ -4165,4 +4166,4 @@
4165 - Wrote replacements for strlcpy and mkdtemp 4166 - Wrote replacements for strlcpy and mkdtemp
4166 - Released 1.0pre1 4167 - Released 1.0pre1
4167 4168
4168$Id: ChangeLog,v 1.840 2001/02/28 01:49:38 djm Exp $ 4169$Id: ChangeLog,v 1.841 2001/02/28 01:51:18 djm Exp $
diff --git a/configure.in b/configure.in
index e61116849..fc6e1faac 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
1# $Id: configure.in,v 1.258 2001/02/28 01:49:38 djm Exp $ 1# $Id: configure.in,v 1.259 2001/02/28 01:51:19 djm Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -1280,7 +1280,7 @@ AC_ARG_WITH(egd-pool,
1280 if test -z "$RANDOM_POOL" ; then 1280 if test -z "$RANDOM_POOL" ; then
1281 AC_MSG_CHECKING(for PRNGD/EGD socket) 1281 AC_MSG_CHECKING(for PRNGD/EGD socket)
1282 # Insert other locations here 1282 # Insert other locations here
1283 for egdsock in /var/run/egd-pool /tmp/egd-pool /etc/entropy /tmp/entropy ; do 1283 for egdsock in /var/run/egd-pool /etc/entropy; do
1284 if test -r $egdsock && $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then 1284 if test -r $egdsock && $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then
1285 EGD_SOCKET="$egdsock" 1285 EGD_SOCKET="$egdsock"
1286 AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET") 1286 AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")