Author: gd
Date: 2007-11-27 09:58:18 +0000 (Tue, 27 Nov 2007)
New Revision: 26145

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

Log:
Fix server side of wkssvc_NetWkstaTransportEnum.

Guenther

Modified:
   branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c
   branches/SAMBA_4_0/source/samba4-knownfail


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c 2007-11-27 
09:49:19 UTC (rev 26144)
+++ branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c 2007-11-27 
09:58:18 UTC (rev 26145)
@@ -138,19 +138,19 @@
 static WERROR dcesrv_wkssvc_NetWkstaTransportEnum(struct dcesrv_call_state 
*dce_call, TALLOC_CTX *mem_ctx,
                       struct wkssvc_NetWkstaTransportEnum *r)
 {
-       r->out.level = r->in.level;
-       r->out.totalentries = 0;
+       r->out.total_entries = 0;
        r->out.resume_handle = NULL;
 
-       switch (r->in.level) {
+       switch (r->in.info->level) {
        case 0:
-               r->out.ctr = talloc(mem_ctx, union wkssvc_NetWkstaTransportCtr);
-               W_ERROR_HAVE_NO_MEMORY(r->out.ctr);
-               r->out.ctr->ctr0 = talloc(mem_ctx, struct 
wkssvc_NetWkstaTransportCtr0);
-               W_ERROR_HAVE_NO_MEMORY(r->out.ctr->ctr0);
+               r->out.info = talloc(mem_ctx, struct 
wkssvc_NetWkstaTransportInfo);
+               W_ERROR_HAVE_NO_MEMORY(r->out.info);
+               r->out.info->level = r->in.info->level;
+               r->out.info->ctr.ctr0 = talloc(mem_ctx, struct 
wkssvc_NetWkstaTransportCtr0);
+               W_ERROR_HAVE_NO_MEMORY(r->out.info->ctr.ctr0);
 
-               r->out.ctr->ctr0->count = 0;
-               r->out.ctr->ctr0->array = NULL;
+               r->out.info->ctr.ctr0->count = 0;
+               r->out.info->ctr.ctr0->array = NULL;
 
                return WERR_NOT_SUPPORTED;
 
@@ -162,21 +162,21 @@
 }
 
 
-/* 
-  WKSSVC_NETRWKSTATRANSPORTADD 
+/*
+  wkssvc_NetrWkstaTransportAdd
 */
-static WERROR dcesrv_WKSSVC_NETRWKSTATRANSPORTADD(struct dcesrv_call_state 
*dce_call, TALLOC_CTX *mem_ctx,
-                      struct WKSSVC_NETRWKSTATRANSPORTADD *r)
+static WERROR dcesrv_wkssvc_NetrWkstaTransportAdd(struct dcesrv_call_state 
*dce_call, TALLOC_CTX *mem_ctx,
+                      struct wkssvc_NetrWkstaTransportAdd *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
 }
 
 
-/* 
-  WKSSVC_NETRWKSTATRANSPORTDEL 
+/*
+  wkssvc_NetrWkstaTransportDel
 */
-static WERROR dcesrv_WKSSVC_NETRWKSTATRANSPORTDEL(struct dcesrv_call_state 
*dce_call, TALLOC_CTX *mem_ctx,
-                      struct WKSSVC_NETRWKSTATRANSPORTDEL *r)
+static WERROR dcesrv_wkssvc_NetrWkstaTransportDel(struct dcesrv_call_state 
*dce_call, TALLOC_CTX *mem_ctx,
+                      struct wkssvc_NetrWkstaTransportDel *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
 }

Modified: branches/SAMBA_4_0/source/samba4-knownfail
===================================================================
--- branches/SAMBA_4_0/source/samba4-knownfail  2007-11-27 09:49:19 UTC (rev 
26144)
+++ branches/SAMBA_4_0/source/samba4-knownfail  2007-11-27 09:58:18 UTC (rev 
26145)
@@ -6,8 +6,6 @@
 RAW-OPLOCK.*/OPLOCK
 RPC-WINREG
 LOCAL-REGISTRY.*/security # Not implemented yet
-RPC-WKSSVC.*NetWkstaGetInfo
-RPC-WKSSVC.*NetWkstaTransportEnum
 RPC-HANDLES.*/lsarpc-shared
 RPC-HANDLES.*/mixed-shared
 RPC-EPMAPPER.*/Insert

Reply via email to