2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 02d50cbed..7ce9e0233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
    OpenSSL >= 0.9.7.  ok djm@
  - (dtucker) [session.c] Bug #789: Do not call do_pam_setcred as a non-root
    user, since some modules might fail due to lack of privilege.  ok djm@
+ - (dtucker) [configure.ac] Bug #748: Always define BROKEN_GETADDRINFO
+   for HP-UX 11.11.  If there are known-good configs where this is not
+   required, please report them.  ok djm@
 
 20040129
  - (dtucker) OpenBSD CVS Sync regress/
@@ -1789,4 +1792,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.3207 2004/02/06 04:30:50 dtucker Exp $
+$Id: ChangeLog,v 1.3208 2004/02/06 04:59:06 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 97ef89a16..768b174b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.191 2004/01/30 03:34:22 dtucker Exp $
+# $Id: configure.ac,v 1.192 2004/02/06 04:59:06 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -192,6 +192,10 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         AC_DEFINE(DISABLE_UTMP)
         AC_DEFINE(LOCKED_PASSWD_STRING, "*")
         AC_DEFINE(SPT_TYPE,SPT_PSTAT)
+        case "$host" in
+        *-*-hpux11.11*)
+                AC_DEFINE(BROKEN_GETADDRINFO);;
+        esac
         LIBS="$LIBS -lsec"
         AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***]))
         ;;