1 files changed, 21 insertions, 7 deletions

diff --git a/openbsd-compat/fake-getaddrinfo.c b/openbsd-compat/fake-getaddrinfo.c
index 67e9eb788..bc58f30a6 100644
--- a/openbsd-compat/fake-getaddrinfo.c
+++ b/openbsd-compat/fake-getaddrinfo.c
@@ -12,7 +12,7 @@
 #include "includes.h"
 #include "ssh.h"
 
-RCSID("$Id: fake-getaddrinfo.c,v 1.2 2001/02/09 01:55:36 djm Exp $");
+RCSID("$Id: fake-getaddrinfo.c,v 1.4.2.1 2003/03/26 05:03:06 djm Exp $");
 
 #ifndef HAVE_GAI_STRERROR
 char *gai_strerror(int ecode)
@@ -67,16 +67,30 @@ int getaddrinfo(const char *hostname, const char *servname,
 {
         struct addrinfo *cur, *prev = NULL;
         struct hostent *hp;
+        struct servent *sp;
         struct in_addr in;
-        int i, port;
+        int i;
+        long int port;
+        u_long addr;
 
-        if (servname)
-                port = htons(atoi(servname));
-        else
-                port = 0;
+        port = 0;
+        if (servname != NULL) {
+                char *cp;
+
+                port = strtol(servname, &cp, 10);
+                if (port > 0 && port <= 65535 && *cp == '\0')
+                        port = htons(port);
+                else if ((sp = getservbyname(servname, NULL)) != NULL)
+                        port = sp->s_port;
+                else
+                        port = 0;
+        }
 
         if (hints && hints->ai_flags & AI_PASSIVE) {
-                if (NULL != (*res = malloc_ai(port, htonl(0x00000000))))
+                addr = htonl(0x00000000);
+                if (hostname && inet_aton(hostname, &in) != 0)
+                        addr = in.s_addr;
+                if (NULL != (*res = malloc_ai(port, addr)))
                         return 0;
                 else
                         return EAI_MEMORY;