From 58d9adf409ac11c5d8fd62cbb1bca9974cfbeb7d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 5 Jan 2005 02:01:19 +0000 Subject: r4526: - much simpler (and more accurate!) ndr_size_*() code generation. It is less efficient, but I really doubt that matters. - use enum in epmapper.idl for protocol type - added support for "enum8bit" flag, used in epmapper.idl (This used to be commit 1a24a50384b7f588844cd012f1218ca242ca4507) --- source4/librpc/rpc/dcerpc.c | 2 +- source4/librpc/rpc/dcerpc_util.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'source4/librpc/rpc') diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index e329297ab6..3fe2d87475 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -907,7 +907,7 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p, if (object) { pkt.u.request.object.object = *object; pkt.pfc_flags |= DCERPC_PFC_FLAG_ORPC; - chunk_size -= ndr_size_GUID(0,object,0); + chunk_size -= ndr_size_GUID(object,0); } DLIST_ADD(p->pending, req); diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 8c454ab64f..4219b75392 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -137,7 +137,7 @@ static const struct { const char *name; enum dcerpc_transport_t transport; int num_protocols; - enum epm_protocols protseq[MAX_PROTSEQ]; + enum epm_protocol protseq[MAX_PROTSEQ]; } transports[] = { { "ncacn_np", NCACN_NP, 3, { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB, EPM_PROTOCOL_NETBIOS }}, @@ -430,6 +430,10 @@ const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *flo case EPM_PROTOCOL_NULL: return NULL; + + default: + DEBUG(0,("Unsupported lhs protocol %d\n", floor->lhs.protocol)); + break; } return NULL; @@ -514,6 +518,10 @@ static NTSTATUS dcerpc_floor_set_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor case EPM_PROTOCOL_NULL: return NT_STATUS_OK; + + default: + DEBUG(0,("Unsupported lhs protocol %d\n", floor->lhs.protocol)); + break; } return NT_STATUS_NOT_SUPPORTED; @@ -602,7 +610,7 @@ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, struct epm_tower *tower, NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding, struct epm_tower *tower) { - const enum epm_protocols *protseq = NULL; + const enum epm_protocol *protseq = NULL; int num_protocols = -1, i; NTSTATUS status; -- cgit