X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcanon-host.c;h=c29f314314f4a457c64e5a997f22eee565b90d3e;hb=c5ce79f4c514b37b5756e85530112d778cff302a;hp=c0b7c13445874f92207c3acae929dbbf1c125931;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git

diff --git a/lib/canon-host.c b/lib/canon-host.c
index c0b7c1344..c29f31431 100644
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -69,7 +69,10 @@ canon_host_r (char const *host, int *cherror)
   status = getaddrinfo (host, NULL, &hints, &res);
   if (!status)
     {
-      retval = strdup (res->ai_canonname);
+      /* http://lists.gnu.org/archive/html/bug-coreutils/2006-09/msg00300.html
+	 says Darwin 7.9.0 getaddrinfo returns 0 but sets
+	 res->ai_canonname to NULL.  */
+      retval = strdup (res->ai_canonname ? res->ai_canonname : host);
       if (!retval && cherror)
 	*cherror = EAI_MEMORY;
       freeaddrinfo (res);