aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-05-19 20:38:39 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-05-19 20:38:39 +0800
commite2edef6e5e7546ce591f2318bce9d115a223d78d (patch)
tree6ae1f364ec4b7c47c6d10beb0533c7d4bcf1b1f4 /e-util
parent040905c9a295fee00e98260175559f54bc6c6110 (diff)
downloadgsoc2013-evolution-e2edef6e5e7546ce591f2318bce9d115a223d78d.tar
gsoc2013-evolution-e2edef6e5e7546ce591f2318bce9d115a223d78d.tar.gz
gsoc2013-evolution-e2edef6e5e7546ce591f2318bce9d115a223d78d.tar.bz2
gsoc2013-evolution-e2edef6e5e7546ce591f2318bce9d115a223d78d.tar.lz
gsoc2013-evolution-e2edef6e5e7546ce591f2318bce9d115a223d78d.tar.xz
gsoc2013-evolution-e2edef6e5e7546ce591f2318bce9d115a223d78d.tar.zst
gsoc2013-evolution-e2edef6e5e7546ce591f2318bce9d115a223d78d.zip
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
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog11
-rw-r--r--e-util/e-host-utils.c7
2 files changed, 17 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 6c0a558e3d..cb5df43d2d 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,14 @@
+2001-05-19 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-host-utils.c (e_gethostbyname_r)
+ [HAVE_GETHOSTBYNAME_R && GETHOSTBYNAME_R_FIVE_ARGS]: Set `*herr'
+ to zero if the function returns a non-NULL pointer to the hostent.
+ According to the docs, a returned non-NULL hostent always means
+ "no error" no matter what the returned value of `herr' is. [And
+ in fact, at least on libc 2.2.3, trying to resolve `localhost'
+ sets herr to `HOST_NOT_FOUND' even if the name is resolved
+ correctly and the returned hostent is non-NULL.]
+
2001-05-16 Dan Winship <danw@ximian.com>
* e-html-utils.c (e_text_to_html_full): add
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;