svn commit: samba r10901 - branches/SAMBA_3_0/source/smbd trunk/source/smbd

[jerry]

Author: jerry
Date: 2005-10-11 14:46:40 +0000 (Tue, 11 Oct 2005)
New Revision: 10901

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

Log:
BUG 3145: Fix build issue regarding quota support on Solaris
Modified:
   branches/SAMBA_3_0/source/smbd/quotas.c
   trunk/source/smbd/quotas.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/quotas.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/quotas.c     2005-10-11 14:38:04 UTC (rev 
10900)
+++ branches/SAMBA_3_0/source/smbd/quotas.c     2005-10-11 14:46:40 UTC (rev 
10901)
@@ -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"));

Modified: trunk/source/smbd/quotas.c
===================================================================
--- trunk/source/smbd/quotas.c  2005-10-11 14:38:04 UTC (rev 10900)
+++ trunk/source/smbd/quotas.c  2005-10-11 14:46:40 UTC (rev 10901)
@@ -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"));