summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-04-05 20:46:15 +0000
committerJeremy Allison <jra@samba.org>2001-04-05 20:46:15 +0000
commit5d609165969c5b06aed581b1a21d7b7b0dca9430 (patch)
tree3d667097e56eca09afbaef41258ded8597b6628b
parent730791a6a864268c6f7033a498a151ecf31ca31c (diff)
downloadsamba-5d609165969c5b06aed581b1a21d7b7b0dca9430.tar.gz
samba-5d609165969c5b06aed581b1a21d7b7b0dca9430.tar.xz
samba-5d609165969c5b06aed581b1a21d7b7b0dca9430.zip
Fix from "Romeril, Alan" <a.romeril@ic.ac.uk> to get his NFS quota code
to work on Solaris 2.6. Jeremy. (This used to be commit bd2fe239db24b8b3fa6a906542af2e238f435331)
-rw-r--r--source3/smbd/quotas.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index 75e27f356ad..ccb5534641a 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -278,15 +278,15 @@ static int xdr_getquota_args(XDR *xdrsp, struct getquota_args *args)
static int xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr)
{
gqr_status status;
- union {
+ union {
rquota gqr_rquota;
} getquota_rslt_u;
-
+
if (!xdr_int(xdrsp, &quotastat)) {
DEBUG(6,("nfs_quotas: Status bad or zero\n"));
return 0;
}
- if (!xdr_int32_t(xdrsp, &gqr->getquota_rslt_u.gqr_rquota.rq_bsize)) {
+ if (!xdr_int(xdrsp, &gqr->getquota_rslt_u.gqr_rquota.rq_bsize)) {
DEBUG(6,("nfs_quotas: Block size bad or zero\n"));
return 0;
}
@@ -294,15 +294,15 @@ static int xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr)
DEBUG(6,("nfs_quotas: Active bad or zero\n"));
return 0;
}
- if (!xdr_uint32_t(xdrsp, &gqr->getquota_rslt_u.gqr_rquota.rq_bhardlimit)) {
+ if (!xdr_int(xdrsp, &gqr->getquota_rslt_u.gqr_rquota.rq_bhardlimit)) {
DEBUG(6,("nfs_quotas: Hardlimit bad or zero\n"));
return 0;
}
- if (!xdr_uint32_t(xdrsp, &gqr->getquota_rslt_u.gqr_rquota.rq_bsoftlimit)) {
+ if (!xdr_int(xdrsp, &gqr->getquota_rslt_u.gqr_rquota.rq_bsoftlimit)) {
DEBUG(6,("nfs_quotas: Softlimit bad or zero\n"));
return 0;
}
- if (!xdr_uint32_t(xdrsp, &gqr->getquota_rslt_u.gqr_rquota.rq_curblocks)) {
+ if (!xdr_int(xdrsp, &gqr->getquota_rslt_u.gqr_rquota.rq_curblocks)) {
DEBUG(6,("nfs_quotas: Currentblocks bad or zero\n"));
return 0;
}