From 10a6b17d3588647ab5e1ee81ba40f1ce12a5184d Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 16 Sep 2010 13:54:21 -0400 Subject: [PATCH] mountd: Support IPv6 in mountlist_list() Replace inet_aton(3) and gethostbyaddr(3) calls in mountlist_list() with calls to the new host_foo() DNS helpers. The new functions will support IPv6 without additional changes, once IPv6 is enabled in the generic hostname helpers. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- utils/mountd/rmtab.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c index cd6abc8..d339296 100644 --- a/utils/mountd/rmtab.c +++ b/utils/mountd/rmtab.c @@ -194,8 +194,6 @@ mountlist_list(void) struct rmtabent *rep; struct stat stb; int lockid; - struct in_addr addr; - struct hostent *he; if ((lockid = xflock(_PATH_RMTABLCK, "r")) < 0) return NULL; @@ -220,11 +218,15 @@ mountlist_list(void) break; } - if (reverse_resolve && - inet_aton((const char *) rep->r_client, &addr) && - (he = gethostbyaddr(&addr, sizeof(addr), AF_INET))) - m->ml_hostname = strdup(he->h_name); - else + if (reverse_resolve) { + struct addrinfo *ai; + ai = host_pton(rep->r_client); + if (ai != NULL) { + m->ml_hostname = host_canonname(ai->ai_addr); + freeaddrinfo(ai); + } + } + if (m->ml_hostname == NULL) m->ml_hostname = strdup(rep->r_client); m->ml_directory = strdup(rep->r_path); -- 2.39.2