From 594a71b9b92af786d34d8d961162374e5e4af72f Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 23 Apr 2002 20:22:59 +1000
Subject: [PATCH]  - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1.
 Spotted by    Robert Urban <urban@spielwiese.de>

---
 ChangeLog    | 6 +++++-
 configure.ac | 8 ++++----
 defines.h    | 6 +++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c967c24b6..4fcc65148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020423
+ - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by
+   Robert Urban <urban@spielwiese.de>
+
 20020421
  - (tim) [entropy.c.] Portability fix for SCO Unix 3.2v4.x (SCO OSR 3.0).
    entropy.c needs seteuid(getuid()) for the setuid(original_uid) to succeed.
@@ -8263,4 +8267,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2061 2002/04/21 18:26:10 tim Exp $
+$Id: ChangeLog,v 1.2062 2002/04/23 10:22:59 djm Exp $
diff --git a/configure.ac b/configure.ac
index 6b2dfe212..9c4d7f670 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.46 2002/04/18 04:19:15 tim Exp $
+# $Id: configure.ac,v 1.47 2002/04/23 10:23:00 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -534,9 +534,9 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
 	getaddrinfo getcwd getgrouplist getnameinfo getopt \
 	getrlimit getrusage getttyent glob inet_aton inet_ntoa \
 	inet_ntop innetgr login_getcapbool md5_crypt memmove \
-	mkdtemp mmap openpty readpassphrase realpath recvmsg \
-	rresvport_af sendmsg setdtablesize setegid setenv seteuid \
-	setlogin setproctitle setresgid setreuid setrlimit \
+	mkdtemp mmap ngetaddrinfo openpty ogetaddrinfo readpassphrase \
+	realpath recvmsg rresvport_af sendmsg setdtablesize setegid \
+	setenv seteuid setlogin setproctitle setresgid setreuid setrlimit \
 	setsid setvbuf sigaction sigvec snprintf socketpair strerror \
 	strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes \
 	vhangup vsnprintf waitpid __b64_ntop _getpty)
diff --git a/defines.h b/defines.h
index 65a03bd17..c6b08c403 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.86 2002/04/12 03:35:40 tim Exp $ */
+/* $Id: defines.h,v 1.87 2002/04/23 10:23:00 djm Exp $ */
 
 
 /* Constants */
@@ -415,6 +415,10 @@ struct winsize {
 
 /* Function replacement / compatibility hacks */
 
+#if !defined(HAVE_GETADDRINFO) && (defined(HAVE_OGETADDRINFO) || defined(HAVE_NGETADDRINFO))
+# define HAVE_GETADDRINFO
+#endif
+
 #ifndef HAVE_GETOPT_OPTRESET
 #define getopt(ac, av, o)  BSDgetopt(ac, av, o)
 #endif