Modify `e_gethostbyname_r()' so that it doesn't report an error if the

5-argument `gethostbyname_r()' returns a non-NULL hostent and a
nonzero herr.

This fixes the "Cannot resolve localhost" error on GNU/Linux with libc
2.2.x.

svn path=/trunk/; revision=9888

1 files changed, 6 insertions, 1 deletions

diff --git a/e-util/e-host-utils.c b/e-util/e-host-utils.c
index d20261e5a6..108a732b83 100644
--- a/e-util/e-host-utils.c
+++ b/e-util/e-host-utils.c
@@ -57,7 +57,12 @@ e_gethostbyname_r (const char *name, struct hostent *host,
 		return errno;
 #else
 	struct hostent *hp;
-	return gethostbyname_r(name, host, buf, buflen, &hp, herr);
+	int retval;
+
+	retval = gethostbyname_r(name, host, buf, buflen, &hp, herr);
+	if (hp != NULL)
+		*herr = 0;
+	return retval;
 #endif
 #else
 	int i;