From a6426f3a2477c3fd528d96129eeb9c4364d6b8c4 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 27 Nov 2007 09:58:18 +0100 Subject: r26145: Fix server side of wkssvc_NetWkstaTransportEnum. Guenther (This used to be commit 6e7651fdea1885b067b5b37ef6795bd8d2f280ec) --- source4/rpc_server/wkssvc/dcesrv_wkssvc.c | 34 +++++++++++++++---------------- source4/samba4-knownfail | 2 -- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c index dfd3d04d11..85acfcf98d 100644 --- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c +++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c @@ -138,19 +138,19 @@ static WERROR dcesrv_WKSSVC_NETRWKSTAUSERSETINFO(struct dcesrv_call_state *dce_c 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 @@ static WERROR dcesrv_wkssvc_NetWkstaTransportEnum(struct dcesrv_call_state *dce_ } -/* - 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); } diff --git a/source4/samba4-knownfail b/source4/samba4-knownfail index 2b5e288345..cc91db26b7 100644 --- a/source4/samba4-knownfail +++ b/source4/samba4-knownfail @@ -6,8 +6,6 @@ BASE-DELETE.*/deltest20b 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 -- cgit