Understand type 2 and type 3 filesystem identifiers.

diff --git a/ChangeLog b/ChangeLog
index b67dbdf677d06eba8de8991fe15815166a129e70..11d3a2206a157f704c4165d3f1afd382337492e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-14 NeilBrown <neilb@suse.de>
+       *utils/mountd/cache.c(nfsd_fh): Understand type 2 and type 3
+       filesystem identifiers, which are used with device numbers
+       That don't fit into 16 bits.
+
 2005-10-07 Olaf Kirch <okir@suse.de>
        * utils/mountd/mountd.c(get_exportlist): Without this patch,
        showmount -e would sometimes display host names that should really

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index e8bb99106e2872ef23ded11a05f6ff41e3e0a1e7..34f949c66b90200973856b6230f9095fe8675fcc 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -119,7 +119,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;
@@ -138,6 +138,30 @@ 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();
@@ -160,7 +184,7 @@ void nfsd_fh(FILE *f)
                            ((exp->m_export.e_flags & NFSEXP_FSID) == 0 ||
                             exp->m_export.e_fsid != fsidnum))
                                continue;
-                       if (fsidtype == 0) {
+                       if (fsidtype != 1) {
                                if (stb.st_ino != inode)
                                        continue;
                                if (major != major(stb.st_dev) ||