From 5d609165969c5b06aed581b1a21d7b7b0dca9430 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 5 Apr 2001 20:46:15 +0000 Subject: Fix from "Romeril, Alan" to get his NFS quota code to work on Solaris 2.6. Jeremy. (This used to be commit bd2fe239db24b8b3fa6a906542af2e238f435331) --- source3/smbd/quotas.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c index 75e27f356a..ccb5534641 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, "astat)) { 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; } -- cgit