- (djm) Support AI_NUMERICHOST in fake-getaddrinfo.c. Needed for recent

   canohost.c changes.

diff --git a/ChangeLog b/ChangeLog
index 9e941811f113c50ae820fd76ff0b2082e41e14a0..df52314062a45c08b13694c7771de896ba5528e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030605
+ - (djm) Support AI_NUMERICHOST in fake-getaddrinfo.c. Needed for recent
+   canohost.c changes.
+
 20030604
  - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
    simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)

diff --git a/openbsd-compat/fake-getaddrinfo.c b/openbsd-compat/fake-getaddrinfo.c
index ec00aacc346739c205aec9e62ad0d64b2446dc6c..00718f1965303e68ba7d638188519754d685f235 100644 (file)
--- a/openbsd-compat/fake-getaddrinfo.c
+++ b/openbsd-compat/fake-getaddrinfo.c
@@ -24,6 +24,8 @@ gai_strerror(int err)
                return ("no address associated with name");
        case EAI_MEMORY:
                return ("memory allocation failure.");
+       case EAI_NONAME:
+               return ("nodename nor servname provided, or not known");
        default:
                return ("unknown/invalid error.");
        }
@@ -116,6 +118,10 @@ getaddrinfo(const char *hostname, const char *servname,
                return (0);
        }
        
+       /* Don't try DNS if AI_NUMERICHOST is set */
+       if (hints && hints->ai_flags & AI_NUMERICHOST)
+               return (EAI_NONAME);
+       
        hp = gethostbyname(hostname);
        if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) {
                struct addrinfo *cur, *prev;

diff --git a/openbsd-compat/fake-getaddrinfo.h b/openbsd-compat/fake-getaddrinfo.h
index ba5e3fea6956f453c17420eb5499b94714f0902b..ce0c27072a08020c88f291e7da99ddac0d4d3fcb 100644 (file)
--- a/openbsd-compat/fake-getaddrinfo.h
+++ b/openbsd-compat/fake-getaddrinfo.h
@@ -8,14 +8,9 @@
 #include "fake-gai-errnos.h"
 
 #ifndef AI_PASSIVE
-# define AI_PASSIVE        1
-# define AI_CANONNAME      2
-#endif
-
-#ifndef NI_NUMERICHOST
-# define NI_NUMERICHOST    2
-# define NI_NAMEREQD       4
-# define NI_NUMERICSERV    8
+# define AI_PASSIVE            (1)
+# define AI_CANONNAME          (1<<1)
+# define AI_NUMERICHOST                (1<<2)
 #endif
 
 #ifndef HAVE_STRUCT_ADDRINFO

diff --git a/openbsd-compat/fake-getnameinfo.h b/openbsd-compat/fake-getnameinfo.h
index 12d6db20891d7cf527092de67288c1f613a1204f..4cc255059d67f4fc39c17655a55e2feb7ce99c84 100644 (file)
--- a/openbsd-compat/fake-getnameinfo.h
+++ b/openbsd-compat/fake-getnameinfo.h
@@ -10,6 +10,12 @@ int getnameinfo(const struct sockaddr *, size_t, char *, size_t,
     char *, size_t, int);
 #endif /* !HAVE_GETNAMEINFO */
 
+#ifndef NI_NUMERICHOST
+# define NI_NUMERICHOST    (1)
+# define NI_NAMEREQD       (1<<1)
+# define NI_NUMERICSERV    (1<<2)
+#endif
+
 #ifndef NI_MAXSERV
 # define NI_MAXSERV 32
 #endif /* !NI_MAXSERV */