[src/trunk]: src/usr.sbin/ypserv/common Rewrite this to use getaddrinfo(), an...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa6f4008936b
branches:  trunk
changeset: 500251:fa6f4008936b
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Dec 09 00:47:57 2000 +0000

description:
Rewrite this to use getaddrinfo(), and to use the canonical name of the
host rather than the hostname as returned by gethostname() if the hostname
does not appear to be fully qualified.

diffstat:

 usr.sbin/ypserv/common/localhostname.c |  45 ++++++++++++---------------------
 1 files changed, 17 insertions(+), 28 deletions(-)

diffs (81 lines):

diff -r 94676859e81f -r fa6f4008936b usr.sbin/ypserv/common/localhostname.c
--- a/usr.sbin/ypserv/common/localhostname.c    Fri Dec 08 23:14:04 2000 +0000
+++ b/usr.sbin/ypserv/common/localhostname.c    Sat Dec 09 00:47:57 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: localhostname.c,v 1.6 1998/07/06 07:06:39 mrg Exp $    */
+/*     $NetBSD: localhostname.c,v 1.7 2000/12/09 00:47:57 thorpej Exp $        */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,10 +38,12 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: localhostname.c,v 1.6 1998/07/06 07:06:39 mrg Exp $");
+__RCSID("$NetBSD: localhostname.c,v 1.7 2000/12/09 00:47:57 thorpej Exp $");
 #endif
 
 #include <sys/param.h>
+#include <sys/socket.h>
+
 #include <err.h>
 #include <netdb.h>
 #include <stdio.h>
@@ -55,9 +57,9 @@
        char *buf;
        size_t buflen;
 {
-       struct hostent *hp;
+       struct addrinfo *res, hints;
        char hostname[MAXHOSTNAMELEN + 1];
-       int i;
+       int error;
 
        if (gethostname(hostname, sizeof(hostname)))
                err(1, "gethostname");
@@ -70,34 +72,21 @@
         * just return it.
         */
        if (strchr(hostname, '.')) {
-               snprintf(buf, buflen, "%s", hostname);
+               strlcpy(buf, hostname, buflen);
                return;
        }
 
        /*
-        * Lookup the host.  Return the first name that appears
-        * to be fully-qualified.
+        * Lookup the host.  Return the canonical name.
         */
-       hp = gethostbyname(hostname);
-       if (hp == NULL)
-               errx(1, "gethostbyname(%s) failed", hostname);
-
-       if (strchr(hp->h_name, '.')) {
-               snprintf(buf, buflen, "%s", hp->h_name);
-               return;
-       }
+       memset(&hints, 0, sizeof(hints));
+       hints.ai_flags = AI_CANONNAME;
+       hints.ai_family = PF_UNSPEC;
 
-       if (hp->h_aliases != NULL && hp->h_aliases[0] != NULL) {
-               for (i = 0; hp->h_aliases[i] != NULL; i++) {
-                       if (strchr(hp->h_aliases[i], '.')) {
-                               snprintf(buf, buflen, "%s", hp->h_aliases[i]);
-                               return;
-                       }
-               }
-       }
-
-       /*
-        * As a last resort, just return hostname.
-        */
-       snprintf(buf, buflen, "%s", hostname);
+       error = getaddrinfo(hostname, NULL, &hints, &res);
+       if (error)
+               errx(1, "getaddrinfo(%s) failed: %s", hostname,
+                   gai_strerror(error));
+       strlcpy(buf, res->ai_canonname, buflen);
+       freeaddrinfo(res);
 }