* New upstream release

[nfs-utils.git] / debian / patches / 15-mountd-fix-path-comparison-for-v4-crossmnt.patch

diff --git a/debian/patches/15-mountd-fix-path-comparison-for-v4-crossmnt.patch b/debian/patches/15-mountd-fix-path-comparison-for-v4-crossmnt.patch
deleted file mode 100644 (file)
index 5b58bc0..0000000
--- a/debian/patches/15-mountd-fix-path-comparison-for-v4-crossmnt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a064fde8c2615333227de97d159bb338d4ac640d Mon Sep 17 00:00:00 2001
-From: J. Bruce Fields <bfields@citi.umich.edu>
-Date: Mon, 8 Mar 2010 14:59:01 -0500
-Subject: [PATCH] mountd: fix path comparison for v4 crossmnt
-
-This was obviously wrong, since path[strlen(path)] == '\0'
-should always be true.
-
-Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- utils/mountd/cache.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
-index b6c148f..45397db 100644
---- a/utils/mountd/cache.c
-+++ b/utils/mountd/cache.c
-@@ -619,7 +619,7 @@ static int is_subdirectory(char *subpath, char *path)
-       int l = strlen(path);
- 
-       return strcmp(subpath, path) == 0
--              || (strncmp(subpath, path, l) == 0 && path[l] == '/');
-+              || (strncmp(subpath, path, l) == 0 && subpath[l] == '/');
- }
- 
- static int path_matches(nfs_export *exp, char *path)
--- 
-1.7.1
-