- dtucker@cvs.openbsd.org 2007/12/27 14:22:08

     [servconf.c canohost.c misc.c channels.c sshconnect.c misc.h ssh-keyscan.c
     sshd.c]
     Add a small helper function to consistently handle the EAI_SYSTEM error
     code of getaddrinfo.  Prompted by vgiffin at apple com via bz #1417.
     ok markus@ stevesk@

1 files changed, 4 insertions, 3 deletions

diff --git a/canohost.c b/canohost.c
index 2345cc35c..8270500d3 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.61 2006/08/03 03:34:41 deraadt Exp $ */
+/* $OpenBSD: canohost.c,v 1.62 2007/12/27 14:22:08 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -32,6 +32,7 @@
 #include "packet.h"
 #include "log.h"
 #include "canohost.h"
+#include "misc.h"
 
 static void check_ip_options(int, char *);
 
@@ -271,7 +272,7 @@ get_socket_address(int sock, int remote, int flags)
         if ((r = getnameinfo((struct sockaddr *)&addr, addrlen, ntop,
             sizeof(ntop), NULL, 0, flags)) != 0) {
                 error("get_socket_address: getnameinfo %d failed: %s", flags,
-                    r == EAI_SYSTEM ? strerror(errno) : gai_strerror(r));
+                    ssh_gai_strerror(r));
                 return NULL;
         }
         return xstrdup(ntop);
@@ -372,7 +373,7 @@ get_sock_port(int sock, int local)
         if ((r = getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0,
             strport, sizeof(strport), NI_NUMERICSERV)) != 0)
                 fatal("get_sock_port: getnameinfo NI_NUMERICSERV failed: %s",
-                    r == EAI_SYSTEM ? strerror(errno) : gai_strerror(r));
+                    ssh_gai_strerror(r));
         return atoi(strport);
 }