- 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, 8 insertions, 6 deletions

diff --git a/channels.c b/channels.c
index 2006353d4..25ebe1294 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.270 2007/06/25 08:20:03 dtucker Exp $ */
+/* $OpenBSD: channels.c,v 1.271 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
@@ -2409,10 +2409,11 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
                 if (addr == NULL) {
                         /* This really shouldn't happen */
                         packet_disconnect("getaddrinfo: fatal error: %s",
-                            gai_strerror(r));
+                            ssh_gai_strerror(r));
                 } else {
                         error("channel_setup_fwd_listener: "
-                            "getaddrinfo(%.64s): %s", addr, gai_strerror(r));
+                            "getaddrinfo(%.64s): %s", addr,
+                            ssh_gai_strerror(r));
                 }
                 return 0;
         }
@@ -2732,7 +2733,7 @@ connect_to(const char *host, u_short port)
         snprintf(strport, sizeof strport, "%d", port);
         if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0) {
                 error("connect_to %.100s: unknown host (%s)", host,
-                    gai_strerror(gaierr));
+                    ssh_gai_strerror(gaierr));
                 return -1;
         }
         for (ai = aitop; ai; ai = ai->ai_next) {
@@ -2874,7 +2875,7 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                 hints.ai_socktype = SOCK_STREAM;
                 snprintf(strport, sizeof strport, "%d", port);
                 if ((gaierr = getaddrinfo(NULL, strport, &hints, &aitop)) != 0) {
-                        error("getaddrinfo: %.100s", gai_strerror(gaierr));
+                        error("getaddrinfo: %.100s", ssh_gai_strerror(gaierr));
                         return -1;
                 }
                 for (ai = aitop; ai; ai = ai->ai_next) {
@@ -3047,7 +3048,8 @@ x11_connect_display(void)
         hints.ai_socktype = SOCK_STREAM;
         snprintf(strport, sizeof strport, "%u", 6000 + display_number);
         if ((gaierr = getaddrinfo(buf, strport, &hints, &aitop)) != 0) {
-                error("%.100s: unknown host. (%s)", buf, gai_strerror(gaierr));
+                error("%.100s: unknown host. (%s)", buf,
+                ssh_gai_strerror(gaierr));
                 return -1;
         }
         for (ai = aitop; ai; ai = ai->ai_next) {