From: deraadt <deraadt@openbsd.org>
Date: Sat, 25 Nov 1995 16:46:23 +0000 (+0000)
Subject: make quotas work on ffs; from andrew@wipux2.wifo.uni-mannheim.de; netbsd pr #1790
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=55d0cfb21b331cca88604763f78f07debfcf95f8;p=openbsd

make quotas work on ffs; from andrew@wipux2.wifo.uni-mannheim.de; netbsd pr #1790
---

diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index 221882069ab..e5b17ea158a 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: quota.1,v 1.1.1.1 1995/10/18 08:45:58 deraadt Exp $
+.\"	$Id: quota.1,v 1.2 1995/11/25 16:46:23 deraadt Exp $
 .\"
 .Dd June 6, 1993
 .Dt QUOTA 1
@@ -112,7 +112,7 @@ daemon on the
 .Nm NFS
 server.
 For
-.Nm UFS
+.Nm FFS
 filesystems, quotas must be turned on in
 .Pa /etc/fstab .
 If
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 74acc892083..dc0b07f2d11 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: quota.c,v 1.1.1.1 1995/10/18 08:45:58 deraadt Exp $";
+static char rcsid[] = "$Id: quota.c,v 1.2 1995/11/25 16:46:24 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -452,8 +452,9 @@ getprivs(id, quotatype)
 		if (strncmp(fst[i].f_fstypename, "nfs", MFSNAMELEN) == 0) {
 			if (getnfsquota(&fst[i], NULL, qup, id, quotatype) == 0)
 				continue;
-		} else if (strncmp(fst[i].f_fstypename, "ufs",
-		    MFSNAMELEN) == 0) {
+		} else if ((strncmp(fst[i].f_fstypename, "ffs",
+		    MFSNAMELEN) == 0) || (strncmp(fst[i].f_fstypename, "ufs",
+			MFSNAMELEN) == 0)) {
 			/*
 			 * XXX
 			 * UFS filesystems must be in /etc/fstab, and must