From c6fc69fbddae87454b2c5449a229e8f4cd802e51 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 3 Dec 2012 13:08:17 +0100
Subject: [PATCH] BUG 97: Remove obsolete hsterror().

This function is pretty much obsolete on most platforms. The standard
errno should be used. If it is not enough on Windows we should use
WSAGetLastError() in future.
---
 ConfigureChecks.cmake |  6 ------
 src/bind.c            | 13 +------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 19eb6002..c5dd3d29 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -117,12 +117,6 @@ if (UNIX)
           set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} socket)
         endif (HAVE_LIBSOCKET)
 
-        # libresolv
-        check_library_exists(resolv hstrerror "" HAVE_LIBRESOLV)
-        if (HAVE_LIBRESOLV)
-          set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} resolv)
-        endif (HAVE_LIBRESOLV)
-
         # libnsl/inet_pton (Solaris)
         check_library_exists(nsl inet_pton "" HAVE_LIBNSL)
         if (HAVE_LIBNSL)
diff --git a/src/bind.c b/src/bind.c
index 59ebc1e8..add5a702 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -61,17 +61,6 @@
 
 #define SOCKOPT_TYPE_ARG4 char
 
-/*
- * We need to provide hstrerror. Not we can't call the parameter h_errno
- * because it's #defined
- */
-static char *hstrerror(int h_errno_val) {
-  static char text[50] = {0};
-
-  snprintf(text, sizeof(text), "getaddrino error %d\n", h_errno_val);
-
-  return text;
-}
 #else /* _WIN32 */
 
 #include <sys/socket.h>
@@ -118,7 +107,7 @@ static socket_t bind_socket(ssh_bind sshbind, const char *hostname,
         ssh_set_error(sshbind,
                       SSH_FATAL,
                       "Setting socket options failed: %s",
-                      hstrerror(h_errno));
+                      strerror(errno));
         freeaddrinfo (ai);
         close(s);
         return -1;