Module Name: src Committed By: tls Date: Sun Aug 10 06:58:47 UTC 2014
Modified Files: src/usr.bin/quota [tls-earlyentropy]: quota.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.49.8.1 src/usr.bin/quota/quota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/quota/quota.c diff -u src/usr.bin/quota/quota.c:1.49 src/usr.bin/quota/quota.c:1.49.8.1 --- src/usr.bin/quota/quota.c:1.49 Sat May 12 19:53:22 2012 +++ src/usr.bin/quota/quota.c Sun Aug 10 06:58:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: quota.c,v 1.49 2012/05/12 19:53:22 dholland Exp $ */ +/* $NetBSD: quota.c,v 1.49.8.1 2014/08/10 06:58:47 tls Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: quota.c,v 1.49 2012/05/12 19:53:22 dholland Exp $"); +__RCSID("$NetBSD: quota.c,v 1.49.8.1 2014/08/10 06:58:47 tls Exp $"); #endif #endif /* not lint */ @@ -502,30 +502,6 @@ getprivs(id_t id, int idtype) } err(1, "%s: quota_open", fst[i].f_mntonname); } -#if 0 - if (strncmp(fst[i].f_fstypename, "nfs", - sizeof(fst[i].f_fstypename)) == 0) { - version = 0; - qup->numqvs = QUOTA_NLIMITS; - qup->qvs = malloc(qup->numqvs * sizeof(qup->qvs[0])); - if (qup->qvs == NULL) { - err(1, "Out of memory"); - } - if (getnfsquota(fst[i].f_mntfromname, - qup->qvs, id, ufs_quota_class_names[idtype]) != 1) - continue; - } else if ((fst[i].f_flag & ST_QUOTA) != 0) { - qup->numqvs = QUOTA_NLIMITS; - qup->qvs = malloc(qup->numqvs * sizeof(qup->qvs[0])); - if (qup->qvs == NULL) { - err(1, "Out of memory"); - } - if (getvfsquota(fst[i].f_mntonname, qup->qvs, &version, - id, idtype, dflag, 0) != 1) - continue; - } else - continue; -#else qup->numqvs = quota_getnumidtypes(qup->qh); qup->qvs = malloc(qup->numqvs * sizeof(qup->qvs[0])); if (qup->qvs == NULL) { @@ -547,7 +523,6 @@ getprivs(id_t id, int idtype) quotaval_clear(&qup->qvs[j]); } } -#endif (void)strlcpy(qup->fsname, fst[i].f_mntonname, sizeof(qup->fsname)); if (quphead == NULL)