o Extend rev. 1.75 and restore an ability to specify a non-default

quota files location.

Submitted by:	Kostik Belousov

1 files changed, 9 insertions, 0 deletions

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index eb0814e..fc03a8b 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -120,6 +120,9 @@ remountable_fs_names[] = {
 	0
 };
 
+static const char userquotaeq[] = "userquota=";
+static const char groupquotaeq[] = "groupquota=";
+
 static int
 use_mountprog(const char *vfstype)
 {
@@ -634,8 +637,14 @@ mangle(options, argcp, argv)
 				continue;
 			} else if (strcmp(p, "userquota") == 0) {
 				continue;
+			} else if (strncmp(p, userquotaeq,
+			    sizeof(userquotaeq) - 1) == 0) {
+				continue;
 			} else if (strcmp(p, "groupquota") == 0) {
 				continue;
+			} else if (strncmp(p, groupquotaeq,
+			    sizeof(groupquotaeq) - 1) == 0) {
+				continue;
 			} else if (*p == '-') {
 				argv[argc++] = p;
 				p = strchr(p, '=');