Made quota tools not to touch mountpoints mounted without quota options

2 files changed, 5 insertions, 1 deletions

diff --git a/Changelog b/Changelog
index e298b79..245a872 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+Changes in quota-tools from 3.08 to 3.09
+* repquota(8) handles multiple entries in /etc/passwd better (Jan Kara)
+* made tools not to touch mountpoints mounted without quota options (Jan Kara, Paul Szabo)
+
 Changes in quota-tools from 3.07 to 3.08
 * Fixed infinite loop in quotacheck under RH7.1 (?)
 * Made quota tools aware of /etc/services (H. J. Lu)
diff --git a/quotasys.c b/quotasys.c
index 9a5ccf3..fb9850e 100644
--- a/quotasys.c
+++ b/quotasys.c
@@ -739,7 +739,7 @@ static int cache_mnt_table(void)
 	while ((mnt = getmntent(mntf))) {
 		const char *devname;
 
-		if (!CORRECT_FSTYPE(mnt->mnt_type))	/* Just basic filtering */
+		if (!hasquota(mnt, USRQUOTA) && !hasquota(mnt, GRPQUOTA))	/* Check FS type and mount options */
 			continue;
 		if (!(devname = get_device_name(mnt->mnt_fsname))) {
 			errstr(_("Can't get device name for %s\n"), mnt->mnt_fsname);