From: deraadt <deraadt@openbsd.org>
Date: Sat, 4 May 1996 12:28:18 +0000 (+0000)
Subject: allow operation even if fstab does not label filesystem as supporting
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b0f424dd2def831d4ec1ddd26c2b0a44bdca73c8;p=openbsd

allow operation even if fstab does not label filesystem as supporting
quotas; pointed out by jonny@gaia.coppe.ufrj.br
---

diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 5dd2769331c..c9622ac30e1 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)quotaon.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: quotaon.c,v 1.6 1996/04/25 11:04:13 deraadt Exp $";
+static char *rcsid = "$Id: quotaon.c,v 1.7 1996/05/04 12:28:18 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -130,9 +130,9 @@ main(argc, argv)
 		if ((argnum = oneof(fs->fs_file, argv, argc)) >= 0 ||
 		    (argnum = oneof(fs->fs_spec, argv, argc)) >= 0) {
 			done |= 1 << argnum;
-			if (gflag && hasquota(fs, GRPQUOTA, &qfnp))
+			if (gflag)
 				errs += quotaonoff(fs, offmode, GRPQUOTA, qfnp);
-			if (uflag && hasquota(fs, USRQUOTA, &qfnp))
+			if (uflag)
 				errs += quotaonoff(fs, offmode, USRQUOTA, qfnp);
 		}
 	}
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 7db5c19acb6..ab086a1a254 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)repquota.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: repquota.c,v 1.6 1996/04/25 11:04:14 deraadt Exp $";
+static char *rcsid = "$Id: repquota.c,v 1.7 1996/05/04 12:30:21 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -146,9 +146,9 @@ main(argc, argv)
 		if ((argnum = oneof(fs->fs_file, argv, argc)) >= 0 ||
 		    (argnum = oneof(fs->fs_spec, argv, argc)) >= 0) {
 			done |= 1 << argnum;
-			if (gflag && hasquota(fs, GRPQUOTA, &qfnp))
+			if (gflag)
 				errs += repquota(fs, GRPQUOTA, qfnp);
-			if (uflag && hasquota(fs, USRQUOTA, &qfnp))
+			if (uflag)
 				errs += repquota(fs, USRQUOTA, qfnp);
 		}
 	}