2 files changed, 17 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e551c9553..70e50f786 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020114
+ - (djm) Bug #50 - make autoconf entropy path checks more robust
+
 20020108
  - (djm) Merge Cygwin copy_environment with do_pam_environment, removing 
    fixed env var size limit in the process. Report from Corinna Vinschen 
@@ -7133,4 +7136,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1719 2002/01/08 21:59:06 stevesk Exp $
+$Id: ChangeLog,v 1.1720 2002/01/14 08:01:03 djm Exp $
diff --git a/configure.ac b/configure.ac
index ec0274e70..0ed1ddddf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-i# $Id: configure.ac,v 1.9 2002/01/05 23:24:28 stevesk Exp $
+i# $Id: configure.ac,v 1.10 2002/01/14 08:01:06 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -1538,6 +1538,12 @@ AC_ARG_WITH(random,
         [
                 if test "x$withval" != "xno" ; then
                         RANDOM_POOL="$withval";
+                        if ! echo "$RANDOM_POOL" | grep -q '^/' ; then 
+                                AC_MSG_ERROR(You must specify an absolute path to the random device)
+                        fi                      
+                        if ! test -r "$RANDOM_POOL" ; then
+                                AC_MSG_WARN(Random device is not readable)
+                        fi
                         AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL")
                 fi
         ],
@@ -1570,6 +1576,12 @@ AC_ARG_WITH(prngd-socket,
         [
                 if test "x$withval" != "xno" ; then
                         PRNGD_SOCKET="$withval"
+                        if echo "$PRNGD_SOCKET" | grep -q '^/' ; then 
+                                AC_MSG_ERROR(You must specify an absolute path to the entropy socket)
+                        fi                      
+                        if ! test -r "$PRNGD_SOCKET" ; then
+                                AC_MSG_WARN(Entropy socket is not readable)
+                        fi
                         AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET")
                 fi
         ],