Cleaned up some typos that were found in the various

[nfs-utils.git] / utils / mountd / cache.c

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 15100d499e91edb442130d0afc1123108ce88e5a..3a50c2647edd63a282e170957e3a1eb11315fb5f 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -61,6 +61,7 @@ int cache_export_ent(char *domain, struct exportent *exp, char *p);
 
 char *lbuf  = NULL;
 int lbuflen = 0;
+extern int use_ipaddr;
 
 void auth_unix_ip(FILE *f)
 {
@@ -74,11 +75,14 @@ void auth_unix_ip(FILE *f)
        char *cp;
        char class[20];
        char ipaddr[20];
-       char *client;
+       char *client = NULL;
        struct in_addr addr;
+       struct hostent *he = NULL;
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
+       xlog(D_CALL, "auth_unix_ip: inbuf '%s'", lbuf);
+
        cp = lbuf;
 
        if (qword_get(&cp, class, 20) <= 0 ||
@@ -94,18 +98,23 @@ void auth_unix_ip(FILE *f)
        auth_reload();
 
        /* addr is a valid, interesting address, find the domain name... */
-       client = client_compose(addr);
-
+       if (!use_ipaddr) {
+               he = client_resolve(addr);
+               client = client_compose(he);
+       }
        
        qword_print(f, "nfsd");
        qword_print(f, ipaddr);
        qword_printint(f, time(0)+30*60);
-       if (client)
+       if (use_ipaddr)
+               qword_print(f, ipaddr);
+       else if (client)
                qword_print(f, *client?client:"DEFAULT");
        qword_eol(f);
+       xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
 
        if (client) free(client);
-       
+       free(he);
 }
 
 void auth_unix_gid(FILE *f)
@@ -264,6 +273,8 @@ void nfsd_fh(FILE *f)
        unsigned int fsidnum=0;
        char fsid[32];
        struct exportent *found = NULL;
+       struct hostent *he = NULL;
+       struct in_addr addr;
        char *found_path = NULL;
        nfs_export *exp;
        int i;
@@ -274,8 +285,10 @@ void nfsd_fh(FILE *f)
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
-       cp = lbuf;
+       xlog(D_CALL, "nfsd_fh: inbuf '%s'", lbuf);
 
+       cp = lbuf;
+       
        dom = malloc(strlen(cp));
        if (dom == NULL)
                return;
@@ -389,7 +402,7 @@ void nfsd_fh(FILE *f)
                                next_exp = exp->m_next;
                        }
 
-                       if (!client_member(dom, exp->m_client->m_hostname))
+                       if (!use_ipaddr && !client_member(dom, exp->m_client->m_hostname))
                                continue;
                        if (exp->m_export.e_mountpoint &&
                            !is_mountpoint(exp->m_export.e_mountpoint[0]?
@@ -441,10 +454,21 @@ void nfsd_fh(FILE *f)
                                continue;
 #endif
                        }
+                       if (use_ipaddr) {
+                               if (he == NULL) {
+                                       if (!inet_aton(dom, &addr))
+                                               goto out;
+                                       he = client_resolve(addr);
+                               }
+                               if (!client_check(exp->m_client, he))
+                                       continue;
+                       }
                        /* It's a match !! */
                        if (!found) {
                                found = &exp->m_export;
                                found_path = strdup(path);
+                               if (found_path == NULL)
+                                       goto out;
                        } else if (strcmp(found->e_path, exp->m_export.e_path)!= 0)
                        {
                                xlog(L_WARNING, "%s and %s have same filehandle for %s, using first",
@@ -489,10 +513,15 @@ void nfsd_fh(FILE *f)
         */
        qword_printint(f, 0x7fffffff);
        if (found)
-               qword_print(f, found->e_path);
+               qword_print(f, found_path);
        qword_eol(f);
  out:
+       if (found_path)
+               free(found_path);
+       if (he)
+               free(he);
        free(dom);
+       xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL);
        return;         
 }
 
@@ -544,20 +573,25 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
        qword_print(f, path);
        qword_printint(f, time(0)+30*60);
        if (exp) {
-               qword_printint(f, exp->e_flags);
+               int different_fs = strcmp(path, exp->e_path) != 0;
+               
+               if (different_fs)
+                       qword_printint(f, exp->e_flags & ~NFSEXP_FSID);
+               else
+                       qword_printint(f, exp->e_flags);
                qword_printint(f, exp->e_anonuid);
                qword_printint(f, exp->e_anongid);
                qword_printint(f, exp->e_fsid);
                write_fsloc(f, exp, path);
                write_secinfo(f, exp);
 #if USE_BLKID
-               if (exp->e_uuid == NULL) {
+               if (exp->e_uuid == NULL || different_fs) {
                        char u[16];
                        if (get_uuid(path, NULL, 16, u)) {
                                qword_print(f, "uuid");
                                qword_printhex(f, u, 16);
                        }
-               } else if (exp->e_uuid) {
+               } else {
                        qword_print(f, "uuid");
                        qword_printhex(f, exp->e_uuid, 16);
                }
@@ -579,11 +613,15 @@ void nfsd_export(FILE *f)
        char *dom, *path;
        nfs_export *exp, *found = NULL;
        int found_type = 0;
+       struct in_addr addr;
+       struct hostent *he = NULL;
 
 
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
+       xlog(D_CALL, "nfsd_export: inbuf '%s'", lbuf);
+
        cp = lbuf;
        dom = malloc(strlen(cp));
        path = malloc(strlen(cp));
@@ -601,7 +639,7 @@ void nfsd_export(FILE *f)
        /* now find flags for this export point in this domain */
        for (i=0 ; i < MCL_MAXTYPES; i++) {
                for (exp = exportlist[i]; exp; exp = exp->m_next) {
-                       if (!client_member(dom, exp->m_client->m_hostname))
+                       if (!use_ipaddr && !client_member(dom, exp->m_client->m_hostname))
                                continue;
                        if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT) {
                                /* if path is a mountpoint below e_path, then OK */
@@ -615,6 +653,15 @@ void nfsd_export(FILE *f)
                                        continue;
                        } else if (strcmp(path, exp->m_export.e_path) != 0)
                                continue;
+                       if (use_ipaddr) {
+                               if (he == NULL) {
+                                       if (!inet_aton(dom, &addr))
+                                               goto out;
+                                       he = client_resolve(addr);
+                               }
+                               if (!client_check(exp->m_client, he))
+                                       continue;
+                       }
                        if (!found) {
                                found = exp;
                                found_type = i;
@@ -622,9 +669,9 @@ void nfsd_export(FILE *f)
                        }
                        /* If one is a CROSSMOUNT, then prefer the longest path */
                        if (((found->m_export.e_flags & NFSEXP_CROSSMOUNT) ||
-                            (found->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&
+                            (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&
                            strlen(found->m_export.e_path) !=
-                           strlen(found->m_export.e_path)) {
+                           strlen(exp->m_export.e_path)) {
 
                                if (strlen(exp->m_export.e_path) >
                                    strlen(found->m_export.e_path)) {
@@ -654,8 +701,10 @@ void nfsd_export(FILE *f)
                dump_to_cache(f, dom, path, NULL);
        }
  out:
+       xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL);
        if (dom) free(dom);
        if (path) free(path);
+       if (he) free(he);
 }