Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove an old, no longer necessary hack from libquota and handle the 

relevant case properly in usr.bin/quota.
This commit is contained in:
dholland 2012-01-30 06:00:49 +00:00
parent 28f4072d2a
commit e5e6acbd31
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libquota/quota_proplib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: quota_proplib.c,v 1.7 2012/01/25 01:22:56 dholland Exp $ */
/* $NetBSD: quota_proplib.c,v 1.8 2012/01/30 06:00:49 dholland Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: quota_proplib.c,v 1.7 2012/01/25 01:22:56 dholland Exp $");
__RCSID("$NetBSD: quota_proplib.c,v 1.8 2012/01/30 06:00:49 dholland Exp $");
#include <stdlib.h>
#include <string.h>
@ -367,6 +367,11 @@ __quota_proplib_get(struct quotahandle *qh, const struct quotakey *qk,
/* as far as I can tell this is required here - dholland */
prop_object_release(cmds);
#if 0
printf("message to kernel:\n%s\n",
prop_dictionary_externalize(dict));
#endif
/*
* Convert it to an XML turd for transfer.
*/
@ -419,6 +424,11 @@ __quota_proplib_get(struct quotahandle *qh, const struct quotakey *qk,
return -1;
}
#if 0
printf("reply from kernel:\n%s\n",
prop_dictionary_externalize(dict));
#endif
/*
* Now unpack the response.
*/
@ -458,15 +468,6 @@ __quota_proplib_get(struct quotahandle *qh, const struct quotakey *qk,
return -1;
}
if (error8 == ENODEV) {
/* XXX this currently means quotas are not enabled */
/* XXX but there's currently no way to fail in quota_open */
/* XXX in that case */
quotaval_clear(qv);
prop_object_release(dict);
return 0;
}
if (error8) {
/* this means the RPC action failed */
prop_object_release(dict);

6
usr.bin/quota/quota.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: quota.c,v 1.44 2012/01/09 15:35:44 dholland Exp $ */
/* $NetBSD: quota.c,v 1.45 2012/01/30 06:00:49 dholland Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\
#if 0
static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: quota.c,v 1.44 2012/01/09 15:35:44 dholland Exp $");
__RCSID("$NetBSD: quota.c,v 1.45 2012/01/30 06:00:49 dholland Exp $");
#endif
#endif /* not lint */
@ -546,7 +546,7 @@ getprivs(id_t id, int idtype)
for (j=0; j<qup->numqvs; j++) {
qk.qk_objtype = j;
if (quota_get(qup->qh, &qk, &qup->qvs[j]) < 0) {
if (errno != ENOENT) {
if (errno != ENOENT && errno != ENODEV) {
warn("%s: quota_get (objtype %u)",
fst[i].f_mntonname, j);
}