From 430dc36c1a456607826cedb9610d2a39cb923bd5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 5 Jun 2005 23:05:37 +0000 Subject: r7312: Add IDL for ncadg packets. (This used to be commit 2009a430b03c685dd65bd573e70d3618f2e0dd0f) --- source4/rpc_server/dcerpc_server.c | 14 +++++++------- source4/rpc_server/dcerpc_server.h | 2 +- source4/rpc_server/dcesrv_auth.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'source4/rpc_server') diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 241986a4b1..3882da08d8 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -363,7 +363,7 @@ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx, } -static void dcesrv_init_hdr(struct dcerpc_packet *pkt) +static void dcesrv_init_hdr(struct ncacn_packet *pkt) { pkt->rpc_vers = 5; pkt->rpc_vers_minor = 0; @@ -382,7 +382,7 @@ static void dcesrv_init_hdr(struct dcerpc_packet *pkt) */ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code) { - struct dcerpc_packet pkt; + struct ncacn_packet pkt; struct dcesrv_call_reply *rep; NTSTATUS status; @@ -421,7 +421,7 @@ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code */ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason) { - struct dcerpc_packet pkt; + struct ncacn_packet pkt; struct dcesrv_call_reply *rep; NTSTATUS status; @@ -460,7 +460,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call) { const char *uuid, *transfer_syntax; uint32_t if_version, transfer_syntax_version; - struct dcerpc_packet pkt; + struct ncacn_packet pkt; struct dcesrv_call_reply *rep; NTSTATUS status; uint32_t result=0, reason=0; @@ -660,7 +660,7 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_ */ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call) { - struct dcerpc_packet pkt; + struct ncacn_packet pkt; struct dcesrv_call_reply *rep; NTSTATUS status; uint32_t result=0, reason=0; @@ -837,7 +837,7 @@ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call) do { uint32_t length; struct dcesrv_call_reply *rep; - struct dcerpc_packet pkt; + struct ncacn_packet pkt; rep = talloc(call, struct dcesrv_call_reply); NT_STATUS_HAVE_NO_MEMORY(rep); @@ -959,7 +959,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn) ndr->flags |= LIBNDR_FLAG_BIGENDIAN; } - status = ndr_pull_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt); + status = ndr_pull_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt); if (!NT_STATUS_IS_OK(status)) { talloc_free(dce_conn->partial_input.data); talloc_free(call); diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h index 85b51545a1..efcb7f9127 100644 --- a/source4/rpc_server/dcerpc_server.h +++ b/source4/rpc_server/dcerpc_server.h @@ -71,7 +71,7 @@ struct dcesrv_call_state { struct dcesrv_call_state *next, *prev; struct dcesrv_connection *conn; struct dcesrv_connection_context *context; - struct dcerpc_packet pkt; + struct ncacn_packet pkt; /* the backend can mark the call * with DCESRV_CALL_STATE_FLAG_ASYNC diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c index 5c098a0b60..e12cccd770 100644 --- a/source4/rpc_server/dcesrv_auth.c +++ b/source4/rpc_server/dcesrv_auth.c @@ -31,7 +31,7 @@ */ BOOL dcesrv_auth_bind(struct dcesrv_call_state *call) { - struct dcerpc_packet *pkt = &call->pkt; + struct ncacn_packet *pkt = &call->pkt; struct dcesrv_connection *dce_conn = call->conn; struct dcesrv_auth *auth = &dce_conn->auth_state; NTSTATUS status; @@ -77,7 +77,7 @@ BOOL dcesrv_auth_bind(struct dcesrv_call_state *call) add any auth information needed in a bind ack, and process the authentication information found in the bind. */ -BOOL dcesrv_auth_bind_ack(struct dcesrv_call_state *call, struct dcerpc_packet *pkt) +BOOL dcesrv_auth_bind_ack(struct dcesrv_call_state *call, struct ncacn_packet *pkt) { struct dcesrv_connection *dce_conn = call->conn; NTSTATUS status; @@ -118,7 +118,7 @@ BOOL dcesrv_auth_bind_ack(struct dcesrv_call_state *call, struct dcerpc_packet * */ BOOL dcesrv_auth_auth3(struct dcesrv_call_state *call) { - struct dcerpc_packet *pkt = &call->pkt; + struct ncacn_packet *pkt = &call->pkt; struct dcesrv_connection *dce_conn = call->conn; NTSTATUS status; @@ -168,7 +168,7 @@ BOOL dcesrv_auth_auth3(struct dcesrv_call_state *call) */ BOOL dcesrv_auth_alter(struct dcesrv_call_state *call) { - struct dcerpc_packet *pkt = &call->pkt; + struct ncacn_packet *pkt = &call->pkt; struct dcesrv_connection *dce_conn = call->conn; NTSTATUS status; @@ -202,7 +202,7 @@ BOOL dcesrv_auth_alter(struct dcesrv_call_state *call) add any auth information needed in a alter ack, and process the authentication information found in the alter. */ -BOOL dcesrv_auth_alter_ack(struct dcesrv_call_state *call, struct dcerpc_packet *pkt) +BOOL dcesrv_auth_alter_ack(struct dcesrv_call_state *call, struct ncacn_packet *pkt) { struct dcesrv_connection *dce_conn = call->conn; NTSTATUS status; @@ -275,7 +275,7 @@ static NTSTATUS dcesrv_check_connect_verifier(DATA_BLOB *blob) */ BOOL dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet) { - struct dcerpc_packet *pkt = &call->pkt; + struct ncacn_packet *pkt = &call->pkt; struct dcesrv_connection *dce_conn = call->conn; DATA_BLOB auth_blob; struct dcerpc_auth auth; @@ -365,7 +365,7 @@ BOOL dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet) push a signed or sealed dcerpc request packet into a blob */ BOOL dcesrv_auth_response(struct dcesrv_call_state *call, - DATA_BLOB *blob, struct dcerpc_packet *pkt) + DATA_BLOB *blob, struct ncacn_packet *pkt) { struct dcesrv_connection *dce_conn = call->conn; NTSTATUS status; @@ -387,7 +387,7 @@ BOOL dcesrv_auth_response(struct dcesrv_call_state *call, ndr->flags |= LIBNDR_FLAG_BIGENDIAN; } - status = ndr_push_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt); + status = ndr_push_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt); if (!NT_STATUS_IS_OK(status)) { return False; } -- cgit