From 65914f1eb3e05694d64e540ff1bf3b8387795657 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 8 Aug 2003 12:15:11 +1000
Subject: [PATCH]  - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes
 have AI_PASSIVE and    AI_CANONNAME in netdb.h but not AI_NUMERICHOST, so
 check each definition    separately before defining them.

---
 ChangeLog                     |  7 ++++++-
 openbsd-compat/fake-rfc2553.h | 11 ++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a0f1ad3db..4281613e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20030808
+ - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and
+   AI_CANONNAME in netdb.h but not AI_NUMERICHOST, so check each definition
+   separately before defining them.
+
 20030807
  - (dtucker) [session.c] Have session_break_req not attempt to send a break
    if TIOCSBRK and TIOCCBRK are not defined (eg Cygwin).
@@ -798,4 +803,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.2884 2003/08/07 06:28:16 dtucker Exp $
+$Id: ChangeLog,v 1.2885 2003/08/08 02:15:11 dtucker Exp $
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index dbf15bb38..1a6c31e9c 100644
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -35,7 +35,7 @@
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
-/* $Id: fake-rfc2553.h,v 1.4 2003/06/13 22:43:23 djm Exp $ */
+/* $Id: fake-rfc2553.h,v 1.5 2003/08/08 02:15:12 dtucker Exp $ */
 
 #ifndef _FAKE_RFC2553_H
 #define _FAKE_RFC2553_H
@@ -88,12 +88,21 @@ struct sockaddr_in6 {
 
 #ifndef NI_NUMERICHOST
 # define NI_NUMERICHOST    (1)
+#endif
+#ifndef NI_NAMEREQD
 # define NI_NAMEREQD       (1<<1)
+#endif
+#ifndef NI_NUMERICSERV
 # define NI_NUMERICSERV    (1<<2)
 #endif
+
 #ifndef AI_PASSIVE
 # define AI_PASSIVE		(1)
+#endif
+#ifndef AI_CANONNAME
 # define AI_CANONNAME		(1<<1)
+#endif
+#ifndef AI_NUMERICHOST
 # define AI_NUMERICHOST		(1<<2)
 #endif