From: J. Bruce Fields <bfields@redhat.com>
Date: Thu, 3 May 2012 18:56:19 +0000 (-0400)
Subject: mountd: fix export upcall failure in use_ipaddr case
X-Git-Tag: nfs-utils-1-2-6-rc7~4
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b46c04422f2a4ae76b89bf43a21839b1c5a1fc79;p=nfs-utils.git

mountd: fix export upcall failure in use_ipaddr case

After 0509d3428f523 "mountd: Replace "struct hostent" with "struct
addinfo"", the export upcall fails in the use_ipaddr case.

I think we never noticed because a) the use_ipaddr case is rarer than
the !use_ipaddr case, and b) the nfsd_fh upcall does a preemptive export
downcall that renders the nfsd export call unnecessary in some cases.

Cc: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 0af6404..47c8691 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -1077,6 +1077,7 @@ static void nfsd_export(FILE *f)
 			goto out;
 		ai = client_resolve(tmp->ai_addr);
 		freeaddrinfo(tmp);
+		if (!ai)
 			goto out;
 	}