summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-07-23 06:33:10 +0200
committerDarren Tucker <dtucker@zip.com.au>2003-07-23 06:33:10 +0200
commitacb98497fb7ff75362491d1c17a5e01fe2beb5b8 (patch)
tree757e20700933eb9e0a9689fba3ca682409cd1598
parentTypo: BROKEN_ADDRINFO -> BROKEN_GETADDRINFO (diff)
downloadopenssh-acb98497fb7ff75362491d1c17a5e01fe2beb5b8.tar.xz
openssh-acb98497fb7ff75362491d1c17a5e01fe2beb5b8.zip
- (dtucker) [configure.ac] Back out change for bug #620.
-rw-r--r--CREDITS3
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac6
3 files changed, 6 insertions, 8 deletions
diff --git a/CREDITS b/CREDITS
index d9aa17e68..575de821b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -45,7 +45,6 @@ Jani Hakala <jahakala@cc.jyu.fi> - Patches
Jarno Huuskonen <jhuuskon@hytti.uku.fi> - Bugfixes
Jim Knoble <jmknoble@jmknoble.cx> - Many patches
Jonchen (email unknown) - the original author of PAM support of SSH
-Joe Rhett (jrhett@isite.net) - Solaris/x86 bugfix
Juergen Keil <jk@tools.de> - scp bugfixing
KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp> - Configure fixes
Kees Cook <cook@cpoint.net> - scp fixes
@@ -94,5 +93,5 @@ Apologies to anyone I have missed.
Damien Miller <djm@mindrot.org>
-$Id: CREDITS,v 1.71 2003/07/19 09:49:45 dtucker Exp $
+$Id: CREDITS,v 1.72 2003/07/23 04:33:10 dtucker Exp $
diff --git a/ChangeLog b/ChangeLog
index 383f85395..fa8ee2fbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20030723
+ - (dtucker) [configure.ac] Back out change for bug #620.
+
20030719
- (dtucker) [configure.ac] Bug #620: Define BROKEN_GETADDRINFO for
Solaris/x86. Patch from jrhett at isite.net.
@@ -718,4 +721,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2863 2003/07/19 10:11:54 dtucker Exp $
+$Id: ChangeLog,v 1.2864 2003/07/23 04:33:10 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index d71cd9985..74909343d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.136 2003/07/19 11:28:31 dtucker Exp $
+# $Id: configure.ac,v 1.137 2003/07/23 04:33:10 dtucker Exp $
AC_INIT
AC_CONFIG_SRCDIR([ssh.c])
@@ -296,10 +296,6 @@ mips-sony-bsd|mips-sony-newsos4)
else
AC_MSG_RESULT(no)
fi
- sol2platform=`echo "$host"| sed -e 's/-solaris.*$//'`
- if test "$sol2platform" -eq "i386-pc"; then
- AC_DEFINE(BROKEN_GETADDRINFO)
- fi
;;
*-*-sunos4*)
CPPFLAGS="$CPPFLAGS -DSUNOS4"