summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-11-25 16:46:25 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-11-25 16:46:25 +0000
commitc45c4bb8e6a48f78e5d83852c36e0476321d8296 (patch)
treeb4588e5de026468ba60c2a7b86647fed54d723cb
parenta0f00c594aa9ead0da0dc2dbea664abf73303f66 (diff)
make quotas work on ffs; from andrew@wipux2.wifo.uni-mannheim.de; netbsd pr #1790
-rw-r--r--usr.bin/quota/quota.14
-rw-r--r--usr.bin/quota/quota.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index 4f26bea13a3..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 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 51c7a449a2a..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 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