summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-02-13 12:11:17 +1100
committerDamien Miller <djm@mindrot.org>2001-02-13 12:11:17 +1100
commitd8ab0d4a852e00ab9e46c7147d887b0b038d7d43 (patch)
treea584e97df6f83d56a2f55564c2e8104b5a3ab7da
parent5d8520ab76cb794358e0bc439d0d1acaabc7dbf8 (diff)
- (djm) Only test -S potential EGD sockets if they exist and are readable.
-rw-r--r--ChangeLog3
-rw-r--r--configure.in4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bb7fda998..8bf6d4738 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120010213 120010213
2 - (bal) added NeXT work around for bsd-snprintf.c in bsd-nextstep.h. 2 - (bal) added NeXT work around for bsd-snprintf.c in bsd-nextstep.h.
3 - (bal) added TODO item to clean up and sort out 'varargs' from 'stdargs' 3 - (bal) added TODO item to clean up and sort out 'varargs' from 'stdargs'
4 - (djm) Only test -S potential EGD sockets if they exist and are readable.
4 5
520010212 620010212
6 - (djm) Update Redhat specfile to allow --define "skip_x11_askpass 1", 7 - (djm) Update Redhat specfile to allow --define "skip_x11_askpass 1",
@@ -3908,4 +3909,4 @@
3908 - Wrote replacements for strlcpy and mkdtemp 3909 - Wrote replacements for strlcpy and mkdtemp
3909 - Released 1.0pre1 3910 - Released 1.0pre1
3910 3911
3911$Id: ChangeLog,v 1.750 2001/02/12 15:57:18 mouring Exp $ 3912$Id: ChangeLog,v 1.751 2001/02/13 01:11:17 djm Exp $
diff --git a/configure.in b/configure.in
index fcb822840..b52448f46 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
1# $Id: configure.in,v 1.235 2001/02/12 07:29:45 mouring Exp $ 1# $Id: configure.in,v 1.236 2001/02/13 01:11:17 djm Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -1092,7 +1092,7 @@ AC_ARG_WITH(egd-pool,
1092 AC_MSG_CHECKING(for PRNGD/EGD socket) 1092 AC_MSG_CHECKING(for PRNGD/EGD socket)
1093 # Insert other locations here 1093 # Insert other locations here
1094 for egdsock in /var/run/egd-pool /etc/entropy /tmp/entropy ; do 1094 for egdsock in /var/run/egd-pool /etc/entropy /tmp/entropy ; do
1095 if $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then 1095 if test -r $egdsock && $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then
1096 EGD_SOCKET="$egdsock" 1096 EGD_SOCKET="$egdsock"
1097 AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET") 1097 AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
1098 break; 1098 break;