- (djm) EGD detection patch from Tim Rice <tim@multitalents.net>

2 files changed, 5 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ef5adbbec..c91d9fcec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
    "Bad packet length" bugs.
  - (djm) Fully revert PAM session patch (again). All PAM session init is 
    now done before the final fork().
+ - (djm) EGD detection patch from Tim Rice <tim@multitalents.net>
 
 20010227
  - (bal) Applied shutdown() patch for sftp.c by  Corinna Vinschen 
@@ -4164,4 +4165,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.839 2001/02/28 00:48:06 djm Exp $
+$Id: ChangeLog,v 1.840 2001/02/28 01:49:38 djm Exp $
diff --git a/configure.in b/configure.in
index b1eb4d4df..e61116849 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.257 2001/02/27 21:14:22 djm Exp $
+# $Id: configure.in,v 1.258 2001/02/28 01:49:38 djm Exp $
 
 AC_INIT(ssh.c)
 
@@ -1280,14 +1280,14 @@ AC_ARG_WITH(egd-pool,
                 if test -z "$RANDOM_POOL" ; then
                         AC_MSG_CHECKING(for PRNGD/EGD socket)
                         # Insert other locations here
-                        for egdsock in /var/run/egd-pool /etc/entropy /tmp/entropy ; do
+                        for egdsock in /var/run/egd-pool /tmp/egd-pool /etc/entropy /tmp/entropy ; do
                                 if test -r $egdsock && $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then
                                         EGD_SOCKET="$egdsock"
                                         AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
                                         break;
                                 fi
                         done
-                        if test -x "$EGD_SOCKET" ; then
+                        if test ! -z "$EGD_SOCKET" ; then
                                 AC_MSG_RESULT($EGD_SOCKET)
                         else
                                 AC_MSG_RESULT(not found)