3 files changed, 13 insertions, 4 deletions

diff --git a/CREDITS b/CREDITS
index d52c7cbcb..d9aa17e68 100644
--- a/CREDITS
+++ b/CREDITS
@@ -45,6 +45,7 @@ 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
@@ -93,5 +94,5 @@ Apologies to anyone I have missed.
 
 Damien Miller <djm@mindrot.org>
 
-$Id: CREDITS,v 1.70 2003/07/14 06:41:55 dtucker Exp $
+$Id: CREDITS,v 1.71 2003/07/19 09:49:45 dtucker Exp $
 
diff --git a/ChangeLog b/ChangeLog
index f91cbe950..469b7590a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030719
+ - (dtucker) [configure.ac] Bug #620: Define BROKEN_GETADDRINFO for
+   Solaris/x86.  Patch from jrhett at isite.net.
+
 20030714
  - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
    loginfailed at all, so assume 3-arg loginfailed if not declared.
@@ -5,7 +9,7 @@
    undef'ing it.
  - (dtucker) Bug #543: [configure.ac port-aix.c port-aix.h]
    Call setauthdb() before loginfailed(), which may load password registry-
-   specific functions.  Based on patch by cawlfiel@us.ibm.com.
+   specific functions.  Based on patch by cawlfiel at us.ibm.com.
  - (dtucker) [port-aix.h] Fix prototypes.
  - (dtucker) OpenBSD CVS Sync
    - avsm@cvs.openbsd.org 2003/07/09 13:58:19
@@ -693,4 +697,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.2856 2003/07/14 07:32:29 dtucker Exp $
+$Id: ChangeLog,v 1.2857 2003/07/19 09:49:45 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 516a24437..4501b4ae4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.134 2003/07/14 06:41:55 dtucker Exp $
+# $Id: configure.ac,v 1.135 2003/07/19 09:49:45 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -296,6 +296,10 @@ 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_ADDRINFO)
+        fi
         ;;
 *-*-sunos4*)
         CPPFLAGS="$CPPFLAGS -DSUNOS4"