From ce84ab9a83441845202e99f8ffd4512839926024 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 18 Aug 2007 06:57:49 +0000 Subject: r24532: rename struct dcerpc_syntax_id into struct ndr_syntax_id and move it into misc.idl The goal is to get rid a all dcerpc specific stuff in the generated ndr layer. metze (This used to be commit 2ed014cfb894cccab1654e3f7d5876393e2b52d7) --- source4/librpc/rpc/dcerpc.c | 12 ++++++------ source4/librpc/rpc/dcerpc.h | 8 ++++---- source4/librpc/rpc/dcerpc_auth.c | 10 +++++----- source4/librpc/rpc/dcerpc_util.c | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'source4/librpc/rpc') diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 20b4dd241b..a687df86b0 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -691,8 +691,8 @@ static void dcerpc_timeout_handler(struct event_context *ev, struct timed_event */ struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - const struct dcerpc_syntax_id *syntax, - const struct dcerpc_syntax_id *transfer_syntax) + const struct ndr_syntax_id *syntax, + const struct ndr_syntax_id *transfer_syntax) { struct composite_context *c; struct ncacn_packet pkt; @@ -1562,8 +1562,8 @@ static void dcerpc_alter_recv_handler(struct rpc_request *req, */ struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - const struct dcerpc_syntax_id *syntax, - const struct dcerpc_syntax_id *transfer_syntax) + const struct ndr_syntax_id *syntax, + const struct ndr_syntax_id *transfer_syntax) { struct composite_context *c; struct ncacn_packet pkt; @@ -1646,8 +1646,8 @@ NTSTATUS dcerpc_alter_context_recv(struct composite_context *ctx) */ NTSTATUS dcerpc_alter_context(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - const struct dcerpc_syntax_id *syntax, - const struct dcerpc_syntax_id *transfer_syntax) + const struct ndr_syntax_id *syntax, + const struct ndr_syntax_id *transfer_syntax) { struct composite_context *creq; creq = dcerpc_alter_context_send(p, mem_ctx, syntax, transfer_syntax); diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index e9e283c7c8..362c0f9c25 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -98,8 +98,8 @@ struct dcerpc_pipe { uint32_t assoc_group_id; - struct dcerpc_syntax_id syntax; - struct dcerpc_syntax_id transfer_syntax; + struct ndr_syntax_id syntax; + struct ndr_syntax_id transfer_syntax; struct dcerpc_connection *conn; struct dcerpc_binding *binding; @@ -182,7 +182,7 @@ struct dcerpc_authservice_list { struct dcerpc_interface_table { const char *name; - struct dcerpc_syntax_id syntax_id; + struct ndr_syntax_id syntax_id; const char *helpstring; uint32_t num_calls; const struct dcerpc_interface_call *calls; @@ -198,7 +198,7 @@ struct dcerpc_interface_list { /* this describes a binding to a particular transport/pipe */ struct dcerpc_binding { enum dcerpc_transport_t transport; - struct dcerpc_syntax_id object; + struct ndr_syntax_id object; const char *host; const char *target_hostname; const char *endpoint; diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c index 0caf574f86..8298b1ecbe 100644 --- a/source4/librpc/rpc/dcerpc_auth.c +++ b/source4/librpc/rpc/dcerpc_auth.c @@ -30,8 +30,8 @@ return the rpc syntax and transfer syntax given the pipe uuid and version */ static NTSTATUS dcerpc_init_syntaxes(const struct dcerpc_interface_table *table, - struct dcerpc_syntax_id *syntax, - struct dcerpc_syntax_id *transfer_syntax) + struct ndr_syntax_id *syntax, + struct ndr_syntax_id *transfer_syntax) { syntax->uuid = table->syntax_id.uuid; syntax->if_version = table->syntax_id.if_version; @@ -49,8 +49,8 @@ struct composite_context *dcerpc_bind_auth_none_send(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p, const struct dcerpc_interface_table *table) { - struct dcerpc_syntax_id syntax; - struct dcerpc_syntax_id transfer_syntax; + struct ndr_syntax_id syntax; + struct ndr_syntax_id transfer_syntax; struct composite_context *c; @@ -218,7 +218,7 @@ struct composite_context *dcerpc_bind_auth_send(TALLOC_CTX *mem_ctx, struct bind_auth_state *state; struct dcerpc_security *sec; - struct dcerpc_syntax_id syntax, transfer_syntax; + struct ndr_syntax_id syntax, transfer_syntax; /* composite context allocation and setup */ c = composite_create(mem_ctx, p->conn->event_ctx); diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 49e1516f54..3e18a66af5 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -151,7 +151,7 @@ static const struct { const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor) { - struct dcerpc_syntax_id syntax; + struct ndr_syntax_id syntax; NTSTATUS status; switch(epm_floor->lhs.protocol) { @@ -422,7 +422,7 @@ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_ return NT_STATUS_OK; } -NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct dcerpc_syntax_id *syntax) +NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct ndr_syntax_id *syntax) { TALLOC_CTX *mem_ctx = talloc_init("floor_get_lhs_data"); struct ndr_pull *ndr = ndr_pull_init_blob(&epm_floor->lhs.lhs_data, mem_ctx); @@ -445,7 +445,7 @@ NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct dcerpc_sy return status; } -static DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, const struct dcerpc_syntax_id *syntax) +static DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax) { struct ndr_push *ndr = ndr_push_init_ctx(mem_ctx); -- cgit