mountd: regression in crossmounts

commit 8e2fb3fc cause a regression in mount export
that are on different local file system.
Exports like (all on different filesystems)

/home *(rw,fsid=0,crossmnt)
/home/fs1 *(rw,crossmnt)
/home/fs1/fs2/fs3 *(rw,nohide)

and then a mount of the root 'mount /home /mnt'
would end up mounting /home/fs1/fs2/fs3 not /home

Reverting the logic of commit 8e2fb3fc until
a better solution can be found for the original
problem.

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index c8aa46f8472cbe21f4d80a70fae4a84f223e16e4..978698d399875925cb43b6f33e363be6ae840e7a 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -371,8 +371,11 @@ export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai)
 static bool subexport(struct exportent *e1, struct exportent *e2)
 {
        char *p1 = e1->e_path, *p2 = e2->e_path;
+       size_t l2 = strlen(p2);
+
        return e2->e_flags & NFSEXP_CROSSMOUNT
-               && is_subdirectory(p1, p2);
+               && strncmp(p1, p2, l2) == 0
+               && p1[l2] == '/';
 }
 
 struct parsed_fsid {