When mountd gets a request to export a mountpoint which is not

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

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index e8d72fa0beb1bd366ad213e07e17128ec8c401e9..fd317cdc40fc16c9744de0dded6b84442c001d6e 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -30,6 +30,7 @@
 #include "mountd.h"
 #include "xmalloc.h"
 #include "fsloc.h"
+#include "pseudoflavors.h"
 
 #ifdef USE_BLKID
 #include "blkid/blkid.h"
@@ -60,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)
 {
@@ -73,8 +75,9 @@ 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;
 
@@ -93,18 +96,22 @@ 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);
 
        if (client) free(client);
-       
+       free(he);
 }
 
 void auth_unix_gid(FILE *f)
@@ -263,6 +270,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;
@@ -388,7 +397,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]?
@@ -397,6 +406,9 @@ void nfsd_fh(FILE *f)
                                dev_missing ++;
                        if (stat(path, &stb) != 0)
                                continue;
+                       if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
+                               continue;
+                       }
                        switch(fsidtype){
                        case FSID_DEV:
                        case FSID_MAJOR_MINOR:
@@ -437,10 +449,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",
@@ -469,7 +492,8 @@ void nfsd_fh(FILE *f)
        }
 
        if (found)
-               cache_export_ent(dom, found, found_path);
+               if (cache_export_ent(dom, found, found_path) < 0)
+                       found = 0;
 
        qword_print(f, dom);
        qword_printint(f, fsidtype);
@@ -484,9 +508,11 @@ 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:
+       free(found_path);
+       free(he);
        free(dom);
        return;         
 }
@@ -514,6 +540,25 @@ static void write_fsloc(FILE *f, struct exportent *ep, char *path)
        release_replicas(servers);
 }
 
+static void write_secinfo(FILE *f, struct exportent *ep)
+{
+       struct sec_entry *p;
+
+       for (p = ep->e_secinfo; p->flav; p++)
+               ; /* Do nothing */
+       if (p == ep->e_secinfo) {
+               /* There was no sec= option */
+               return;
+       }
+       qword_print(f, "secinfo");
+       qword_printint(f, p - ep->e_secinfo);
+       for (p = ep->e_secinfo; p->flav; p++) {
+               qword_printint(f, p->flav->fnum);
+               qword_printint(f, p->flags);
+       }
+
+}
+
 static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *exp)
 {
        qword_print(f, domain);
@@ -525,6 +570,7 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
                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) {
                        char u[16];
@@ -554,6 +600,8 @@ 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)
@@ -576,7 +624,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 */
@@ -590,6 +638,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;
@@ -619,14 +676,19 @@ void nfsd_export(FILE *f)
        }
 
        if (found) {
-               dump_to_cache(f, dom, path, &found->m_export);
-               mountlist_add(dom, path);
+               if (dump_to_cache(f, dom, path, &found->m_export) < 0) {
+                       xlog(L_WARNING,
+                            "Cannot export %s, possibly unsupported filesystem"
+                            " or fsid= required", path);
+                       dump_to_cache(f, dom, path, NULL);
+               }
        } else {
                dump_to_cache(f, dom, path, NULL);
        }
  out:
        if (dom) free(dom);
        if (path) free(path);
+       if (he) free(he);
 }
 
 
@@ -694,9 +756,13 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)
                return -1;
 
        err = dump_to_cache(f, domain, exp->e_path, exp);
-       mountlist_add(domain, exp->e_path);
+       if (err) {
+               xlog(L_WARNING,
+                    "Cannot export %s, possibly unsupported filesystem or"
+                    " fsid= required", exp->e_path);
+       }
 
-       while ((exp->e_flags & NFSEXP_CROSSMOUNT) && path) {
+       while (err == 0 && (exp->e_flags & NFSEXP_CROSSMOUNT) && path) {
                /* really an 'if', but we can break out of
                 * a 'while' more easily */
                /* Look along 'path' for other filesystems
@@ -714,16 +780,17 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)
                dev = stb.st_dev;
                while(path[l] == '/') {
                        char c;
-                       int err;
+                       /* errors for submount should fail whole filesystem */
+                       int err2;
 
                        l++;
                        while (path[l] != '/' && path[l])
                                l++;
                        c = path[l];
                        path[l] = 0;
-                       err = lstat(path, &stb);
+                       err2 = lstat(path, &stb);
                        path[l] = c;
-                       if (err < 0)
+                       if (err2 < 0)
                                break;
                        if (stb.st_dev == dev)
                                continue;