support_format_hostent: Add more error information for NETDB_INTERNAL

2 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index bb09add53d..9cc0df5aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-05  Florian Weimer  <fweimer@redhat.com>
+
+	* support/support_format_hostent.c (support_format_hostent): Add
+	more error information for NETDB_INTERNAL.
+
 2017-10-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config.h.in (NO_HIDDEN_EXTERN_FUNC_IN_PIE): New.
diff --git a/support/support_format_hostent.c b/support/support_format_hostent.c
index 5b5f26082e..88c85ec1f1 100644
--- a/support/support_format_hostent.c
+++ b/support/support_format_hostent.c
@@ -19,6 +19,7 @@
 #include <support/format_nss.h>
 
 #include <arpa/inet.h>
+#include <errno.h>
 #include <stdio.h>
 #include <support/support.h>
 #include <support/xmemstream.h>
@@ -41,10 +42,15 @@ support_format_hostent (struct hostent *h)
 {
   if (h == NULL)
     {
-      char *value = support_format_herrno (h_errno);
-      char *result = xasprintf ("error: %s\n", value);
-      free (value);
-      return result;
+      if (h_errno == NETDB_INTERNAL)
+        return xasprintf ("error: NETDB_INTERNAL (errno %d, %m)\n", errno);
+      else
+        {
+          char *value = support_format_herrno (h_errno);
+          char *result = xasprintf ("error: %s\n", value);
+          free (value);
+          return result;
+        }
     }
 
   struct xmemstream mem;