2004-08-14 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/posix/getaddrinfo.c (getaddrinfo): I rfc3484 sorting is
+ performed, make sure it is still the first entry after sotring
+ which has the ai_canonname information.
+
* sysdeps/posix/getaddrinfo.c (gaih_inet): Really set ai_canonname
only in one entry.
/* Sort results according to RFC 3484. */
struct sort_result results[nresults];
struct addrinfo *q;
+ char *canonname = NULL;
for (i = 0, q = p; q != NULL; ++i, q = q->ai_next)
{
close_not_cancel_no_status (fd);
}
+
+ /* Remember the canonical name. */
+ if (q->ai_canonname != NULL)
+ {
+ assert (canonname == NULL);
+ canonname = q->ai_canonname;
+ q->ai_canonname = NULL;
+ }
}
/* We got all the source addresses we can get, now sort using
for (i = 1; i < nresults; ++i)
q = q->ai_next = results[i].dest_addr;
q->ai_next = NULL;
+
+ /* Fill in the canonical name into the new first entry. */
+ p->ai_canonname = canonname;
}
if (p)