see changelog

[nfs-utils.git] / support / export / client.c

diff --git a/support/export/client.c b/support/export/client.c
index 076b0c069dd1ff2991d374ee8c498087601321e8..6d5d3063317502d0a958493795b046df23a4f5ab 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -32,8 +32,12 @@ static int   client_checkaddr(nfs_client *clp, struct in_addr addr);
 nfs_client     *clientlist[MCL_MAXTYPES] = { NULL, };
 
 
+/* if canonical is set, then we *know* this is already a canonical name
+ * so hostname lookup is avoided.
+ * This is used when reading /proc/fs/nfs/exports
+ */
 nfs_client *
-client_lookup(char *hname)
+client_lookup(char *hname, int canonical)
 {
        nfs_client      *clp = NULL;
        int             htype;
@@ -41,7 +45,7 @@ client_lookup(char *hname)
 
        htype = client_gettype(hname);
 
-       if (htype == MCL_FQDN) {
+       if (htype == MCL_FQDN && !canonical) {
                struct hostent *hp2;
                hp = gethostbyname(hname);
                if (hp == NULL || hp->h_addrtype != AF_INET) {
@@ -53,8 +57,17 @@ client_lookup(char *hname)
                hp = gethostbyaddr(hp2->h_addr, hp2->h_length,
                                   hp2->h_addrtype);
                if (hp) {
-                       free(hp2);
                        hp = hostent_dup(hp);
+                       /* but now we might not have all addresses... */
+                       if (hp2->h_addr_list[1]) {
+                               struct hostent *hp3 =
+                                       gethostbyname(hp->h_name);
+                               if (hp3) {
+                                       free(hp);
+                                       hp = hostent_dup(hp3);
+                               }
+                       }
+                       free(hp2);
                } else
                        hp = hp2;
 
@@ -66,7 +79,7 @@ client_lookup(char *hname)
                }
        } else {
                for (clp = clientlist[htype]; clp; clp = clp->m_next) {
-                       if (strcmp(hname, clp->m_hostname)==0)
+                       if (strcasecmp(hname, clp->m_hostname)==0)
                                break;
                }
        }