[quota/f18] Fix reporting for NFSv3 mount points

[Petr Pisar]

commit 6303111f40b28b78dfec6eccab05061ac45f39b9
Author: Petr Písař <ppisar at redhat.com>
Date:   Fri Sep 7 15:11:06 2012 +0200

    Fix reporting for NFSv3 mount points

 ...01-quota-Fix-reporting-of-NFS-mountpoints.patch |   31 ++++++++++++++++++++
 quota.spec                                         |    8 ++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/quota-4.01-quota-Fix-reporting-of-NFS-mountpoints.patch b/quota-4.01-quota-Fix-reporting-of-NFS-mountpoints.patch
new file mode 100644
index 0000000..aa3ab32
--- /dev/null
+++ b/quota-4.01-quota-Fix-reporting-of-NFS-mountpoints.patch
@@ -0,0 +1,31 @@
+From 8b6ce13e1b196cb9d0cc5b24dfc75c97a9eb883d Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack at suse.cz>
+Date: Mon, 20 Aug 2012 19:16:05 +0200
+Subject: [PATCH] quota: Fix reporting of NFS mountpoints
+
+Commit b8ab76ad19e3c284ac14bd0450662bfc41719e03 creating split_nfs_mount()
+forgot to remove zeroing of pathname character. That lead to broken reporting
+quotas for NFSv3 mount points.
+
+Thanks to anonymous reporter for spotting this.
+
+Signed-off-by: Jan Kara <jack at suse.cz>
+---
+ rquota_client.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/rquota_client.c b/rquota_client.c
+index 54a8921..e26e066 100644
+--- a/rquota_client.c
++++ b/rquota_client.c
+@@ -162,7 +162,6 @@ int rpc_rquota_get(struct dquot *dquot)
+ 		return -ENOENT;
+ 	}
+ 
+-	*pathname++ = '\0';
+ 	/* For NFSv4, we send the filesystem path without initial /. Server prepends proper
+ 	 * NFS pseudoroot automatically and uses this for detection of NFSv4 mounts. */
+ 	if ((dquot->dq_h->qh_io_flags & IOFL_NFS_MIXED_PATHS) &&
+-- 
+1.7.11.4
+
diff --git a/quota.spec b/quota.spec
index 57af474..3a05fa6 100644
--- a/quota.spec
+++ b/quota.spec
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 4.00
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -36,6 +36,8 @@ Patch7: quota-4.00-Do-not-report-missing-utmp-record-to-syslog.patch
 Patch8: quota-4.00-edquota-Fix-editting-of-more-users.patch
 # Bug #837341, in upstream after 4.00
 Patch9: quota-4.00-repquota-Fix-reporting-for-XFS.patch
+# In upstream 4.01 (SF#3544564)
+Patch10: quota-4.01-quota-Fix-reporting-of-NFS-mountpoints.patch
 
 
 %description
@@ -117,6 +119,7 @@ Linux/UNIX environment.
 %patch7 -p1 -b .suppress_missing_utmp
 %patch8 -p1 -b .edquota_more_users
 %patch9 -p1 -b .repqouta_xfs
+%patch10 -p1 -b .nfs3_pathname
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -242,6 +245,9 @@ echo '  systemd-sysv-convert --apply quota_nld'
 
 
 %changelog
+* Fri Sep 07 2012 Petr Pisar <ppisar at redhat.com> - 1:4.00-6
+- Fix reporting for NFSv3 mount points
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.00-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild