[nfs-utils/f18] Fixed crossmount regression in mountd (bz 909882)

[Steve Dickson]

commit 53eca2099927621ef6e0abe2118b790550add86b
Author: Steve Dickson <steved at redhat.com>
Date:   Mon Mar 25 11:14:21 2013 -0400

    Fixed crossmount regression in mountd (bz 909882)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-utils-1.2.7-mountd-crossmnt.patch |   13 +++++++++++++
 nfs-utils.spec                        |    2 ++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/nfs-utils-1.2.7-mountd-crossmnt.patch b/nfs-utils-1.2.7-mountd-crossmnt.patch
new file mode 100644
index 0000000..71a9b51
--- /dev/null
+++ b/nfs-utils-1.2.7-mountd-crossmnt.patch
@@ -0,0 +1,13 @@
+diff -up nfs-utils-1.2.7/utils/mountd/cache.c.orig nfs-utils-1.2.7/utils/mountd/cache.c
+--- nfs-utils-1.2.7/utils/mountd/cache.c.orig	2013-03-25 11:03:56.003106420 -0400
++++ nfs-utils-1.2.7/utils/mountd/cache.c	2013-03-25 11:05:51.435050997 -0400
+@@ -374,7 +374,8 @@ static bool subexport(struct exportent *
+ 	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 {
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 252b698..0ef0547 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -37,6 +37,7 @@ Source52: nfs-server.postconfig
 %define nfs_configs %{SOURCE50} %{SOURCE51} %{SOURCE52} 
 
 Patch001: nfs-utils.1.2.8.rc3.patch
+Patch002: nfs-utils-1.2.7-mountd-crossmnt.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -300,6 +301,7 @@ fi
 %changelog
 * Mon Mar 25 2013 Steve Dickson <steved at redhat.com> 1.2.7-4
 - Added nfs-lock.service to After line in nfs-server.service (bz 914792)
+- Fixed crossmount regression in mountd (bz 909882)
 
 * Wed Jan 16 2013 Steve Dickson <steved at redhat.com> 1.2.7-3
 - Updated to latest upstream RC release: nfs-utils.1.2.8-rc3