Merge branch 'upstream'

[nfs-utils.git] / debian / patches / 05-refuse-non-ident-maptypes.patch

diff --git a/debian/patches/05-refuse-non-ident-maptypes.patch b/debian/patches/05-refuse-non-ident-maptypes.patch
index 7154af3323e997cba13e7da4c03e8914989772c3..c2c93f48b9485494b130cafc65f8e694487c2143 100644 (file)
--- a/debian/patches/05-refuse-non-ident-maptypes.patch
+++ b/debian/patches/05-refuse-non-ident-maptypes.patch
@@ -1,9 +1,9 @@
-Index: nfs-utils-1.0.11~git-20060105/utils/mountd/cache.c
+Index: nfs-utils-1.0.11~git-20060117/utils/mountd/cache.c
 ===================================================================
---- nfs-utils-1.0.11~git-20060105.orig/utils/mountd/cache.c
-+++ nfs-utils-1.0.11~git-20060105/utils/mountd/cache.c
-@@ -375,6 +375,12 @@ void cache_export(nfs_export *exp)
- {
+--- nfs-utils-1.0.11~git-20060117.orig/utils/mountd/cache.c
++++ nfs-utils-1.0.11~git-20060117/utils/mountd/cache.c
+@@ -377,6 +377,12 @@ int cache_export(nfs_export *exp)
+       int err;
        FILE *f;
  
 +      if (exp->m_export.e_maptype != CLE_MAP_IDENT) {
@@ -14,4 +14,4 @@ Index: nfs-utils-1.0.11~git-20060105/utils/mountd/cache.c
 +
        f = fopen("/proc/net/rpc/auth.unix.ip/channel", "w");
        if (!f)
-               return;
+               return -1;