Imported Debian patch 1.0.10-5

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

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 2e35b17417173914899234d4cfe28f6ff9aa42a4..0296f4efd19f187ea20bcfcf1d785e8a05f29bc3 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -6,7 +6,10 @@
  * and listen for requests (using my_svc_run)
  * 
  */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/select.h>
@@ -67,6 +70,8 @@ void auth_unix_ip(FILE *f)
        if (inet_aton(ipaddr, &addr)==0)
                return;
 
+       auth_reload();
+
        /* addr is a valid, interesting address, find the domain name... */
        client = client_compose(addr);
 
@@ -117,7 +122,7 @@ void nfsd_fh(FILE *f)
                goto out;
        if (qword_get_int(&cp, &fsidtype) != 0)
                goto out;
-       if (fsidtype < 0 || fsidtype > 1)
+       if (fsidtype < 0 || fsidtype > 3)
                goto out; /* unknown type */
        if ((fsidlen = qword_get(&cp, fsid, 32)) <= 0)
                goto out;
@@ -136,26 +141,53 @@ void nfsd_fh(FILE *f)
                        goto out;
                memcpy(&fsidnum, fsid, 4);
                break;
+
+       case 2: /* 12 bytes: 4 major, 4 minor, 4 inode 
+                * This format is never actually used but was
+                * an historical accident
+                */
+               if (fsidlen != 12)
+                       goto out;
+               memcpy(&dev, fsid, 4); major = ntohl(dev);
+               memcpy(&dev, fsid+4, 4); minor = ntohl(dev);
+               memcpy(&inode, fsid+8, 4);
+               break;
+
+       case 3: /* 8 bytes: 4 byte packed device number, 4 inode */
+               /* This is *host* endian, not net-byte-order, because
+                * no-one outside this host has any business interpreting it
+                */
+               if (fsidlen != 8)
+                       goto out;
+               memcpy(&dev, fsid, 4);
+               memcpy(&inode, fsid+4, 4);
+               major = (dev & 0xfff00) >> 8;
+               minor = (dev & 0xff) | ((dev >> 12) & 0xfff00);
+               break;
+
        }
 
+       auth_reload();
+
        /* Now determine export point for this fsid/domain */
        for (i=0 ; i < MCL_MAXTYPES; i++) {
                for (exp = exportlist[i]; exp; exp = exp->m_next) {
+                       struct stat stb;
+
                        if (!client_member(dom, exp->m_client->m_hostname))
                                continue;
+                       if (exp->m_export.e_mountpoint &&
+                           !is_mountpoint(exp->m_export.e_mountpoint[0]?
+                                          exp->m_export.e_mountpoint:
+                                          exp->m_export.e_path))
+                               dev_missing ++;
+                       if (stat(exp->m_export.e_path, &stb) != 0)
+                               continue;
                        if (fsidtype == 1 &&
                            ((exp->m_export.e_flags & NFSEXP_FSID) == 0 ||
                             exp->m_export.e_fsid != fsidnum))
                                continue;
-                       if (fsidtype == 0) {
-                               struct stat stb;
-                               if (exp->m_export.e_mountpoint &&
-                                   !is_mountpoint(exp->m_export.e_mountpoint[0]?
-                                                  exp->m_export.e_mountpoint:
-                                                  exp->m_export.e_path))
-                                       dev_missing ++;
-                               if (stat(exp->m_export.e_path, &stb) != 0)
-                                       continue;
+                       if (fsidtype != 1) {
                                if (stb.st_ino != inode)
                                        continue;
                                if (major != major(stb.st_dev) ||
@@ -236,6 +268,8 @@ void nfsd_export(FILE *f)
        if (qword_get(&cp, path, strlen(lbuf)) <= 0)
                goto out;
 
+       auth_reload();
+
        /* 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) {
@@ -309,6 +343,7 @@ int cache_process_req(fd_set *readfds)
                    FD_ISSET(fileno(cachelist[i].f), readfds)) {
                        cnt++;
                        cachelist[i].cache_handle(cachelist[i].f);
+                       FD_CLR(fileno(cachelist[i].f), readfds);
                }
        }
        return cnt;
@@ -346,6 +381,12 @@ void cache_export(nfs_export *exp)
 {
        FILE *f;
 
+       if (exp->m_export.e_maptype != CLE_MAP_IDENT) {
+               xlog(L_ERROR, "%s: unsupported mapping; kernel supports only 'identity' (default)",
+                   exp->m_export.m_path);
+               return;
+       }
+
        f = fopen("/proc/net/rpc/auth.unix.ip/channel", "w");
        if (!f)
                return;
@@ -368,15 +409,19 @@ void cache_export(nfs_export *exp)
  * { 
  *   echo $domain $path $length 
  *   read filehandle <&0
- * } <> /proc/fs/nfs/filehandle
+ * } <> /proc/fs/nfsd/filehandle
  */
 struct nfs_fh_len *
 cache_get_filehandle(nfs_export *exp, int len, char *p)
 {
-       FILE *f = fopen("/proc/fs/nfs/filehandle", "r+");
+       FILE *f = fopen("/proc/fs/nfsd/filehandle", "r+");
        char buf[200];
        char *bp = buf;
+       int failed;
        static struct nfs_fh_len fh;
+
+       if (!f)
+               f = fopen("/proc/fs/nfs/filehandle", "r+");
        if (!f)
                return NULL;
 
@@ -385,10 +430,12 @@ cache_get_filehandle(nfs_export *exp, int len, char *p)
        qword_printint(f, len); 
        qword_eol(f);
        
-       if (fgets(buf, sizeof(buf), f) == NULL)
+       failed = (fgets(buf, sizeof(buf), f) == NULL);
+       fclose(f);
+       if (failed)
                return NULL;
        memset(fh.fh_handle, 0, sizeof(fh.fh_handle));
-       fh.fh_size = qword_get(&bp, fh.fh_handle, NFS3_FHSIZE);
+       fh.fh_size = qword_get(&bp, (char *)fh.fh_handle, NFS3_FHSIZE);
        return &fh;
 }