svn commit: samba r10902 - in branches/tmp/SAMBA_3_0_20B: . source/smbd

[jerry]

Author: jerry
Date: 2005-10-11 14:56:44 +0000 (Tue, 11 Oct 2005)
New Revision: 10902

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10902

Log:
adding quota fix from Alex Deiter
Modified:
   branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt
   branches/tmp/SAMBA_3_0_20B/source/smbd/quotas.c


Changeset:
Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt
===================================================================
--- branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt     2005-10-11 14:46:40 UTC (rev 
10901)
+++ branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt     2005-10-11 14:56:44 UTC (rev 
10902)
@@ -33,6 +33,10 @@
       which cannot be read due to permissions.
 
 
+o   Alex Deiter <[EMAIL PROTECTED]>
+    * BUG 3145: Fix build issue regarding quota support on Solaris.
+
+
 o   Volker Lendecke <[EMAIL PROTECTED]>
     * BUG 3068: Fix for winbindd crashed by empty DC alternative 
       name.

Modified: branches/tmp/SAMBA_3_0_20B/source/smbd/quotas.c
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/smbd/quotas.c     2005-10-11 14:46:40 UTC 
(rev 10901)
+++ branches/tmp/SAMBA_3_0_20B/source/smbd/quotas.c     2005-10-11 14:56:44 UTC 
(rev 10902)
@@ -414,7 +414,7 @@
 
 static int quotastat;
 
-static int xdr_getquota_args(XDR *xdrsp, struct getquota_args *args)
+static int my_xdr_getquota_args(XDR *xdrsp, struct getquota_args *args)
 {
        if (!xdr_string(xdrsp, &args->gqa_pathp, RQ_PATHLEN ))
                return(0);
@@ -423,7 +423,7 @@
        return (1);
 }
 
-static int xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr)
+static int my_xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr)
 {
        if (!xdr_int(xdrsp, &quotastat)) {
                DEBUG(6,("nfs_quotas: Status bad or zero\n"));
@@ -493,7 +493,7 @@
        clnt->cl_auth = authunix_create_default();
        DEBUG(9,("nfs_quotas: auth_success\n"));
 
-       clnt_stat=clnt_call(clnt, RQUOTAPROC_GETQUOTA, xdr_getquota_args, 
(caddr_t)&args, xdr_getquota_rslt, (caddr_t)&gqr, timeout);
+       clnt_stat=clnt_call(clnt, RQUOTAPROC_GETQUOTA, my_xdr_getquota_args, 
(caddr_t)&args, my_xdr_getquota_rslt, (caddr_t)&gqr, timeout);
 
        if (clnt_stat != RPC_SUCCESS) {
                DEBUG(9,("nfs_quotas: clnt_call fail\n"));