s3-dcerpc: remove more obsolete or duplicate headers.

Guenther

1 files changed, 22 insertions, 22 deletions

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 133334b9b1..393c7260d9 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -872,14 +872,14 @@ static NTSTATUS cli_pipe_validate_current_pdu(struct rpc_pipe_client *cli, RPC_H
 
 	/* Ensure we have the correct type. */
 	switch (prhdr->pkt_type) {
-		case RPC_ALTCONTRESP:
-		case RPC_BINDACK:
+		case DCERPC_PKT_ALTER_RESP:
+		case DCERPC_PKT_BIND_ACK:
 
 			/* Alter context and bind ack share the same packet definitions. */
 			break;
 
 
-		case RPC_RESPONSE:
+		case DCERPC_PKT_RESPONSE:
 		{
 			RPC_HDR_RESP rhdr_resp;
 			uint8 ss_padding_len = 0;
@@ -935,14 +935,14 @@ static NTSTATUS cli_pipe_validate_current_pdu(struct rpc_pipe_client *cli, RPC_H
 			break;
 		}
 
-		case RPC_BINDNACK:
+		case DCERPC_PKT_BIND_NAK:
 			DEBUG(1, ("cli_pipe_validate_current_pdu: Bind NACK "
 				  "received from %s!\n",
 				  rpccli_pipe_txt(debug_ctx(), cli)));
 			/* Use this for now... */
 			return NT_STATUS_NETWORK_ACCESS_DENIED;
 
-		case RPC_FAULT:
+		case DCERPC_PKT_FAULT:
 		{
 			RPC_HDR_RESP rhdr_resp;
 			RPC_HDR_FAULT fault_resp;
@@ -989,10 +989,10 @@ static NTSTATUS cli_pipe_validate_current_pdu(struct rpc_pipe_client *cli, RPC_H
 	   data before now as we may have needed to do cryptographic actions on
 	   it before. */
 
-	if ((prhdr->pkt_type == RPC_BINDACK) && !(prhdr->flags & RPC_FLG_LAST)) {
+	if ((prhdr->pkt_type == DCERPC_PKT_BIND_ACK) && !(prhdr->flags & DCERPC_PFC_FLAG_LAST)) {
 		DEBUG(5,("cli_pipe_validate_current_pdu: bug in server (AS/U?), "
 			"setting fragment first/last ON.\n"));
-		prhdr->flags |= RPC_FLG_FIRST|RPC_FLG_LAST;
+		prhdr->flags |= DCERPC_PFC_FLAG_FIRST|DCERPC_PFC_FLAG_LAST;
 	}
 
 	return NT_STATUS_OK;
@@ -1392,7 +1392,7 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
 		return;
 	}
 
-	if ((state->rhdr.flags & RPC_FLG_FIRST)
+	if ((state->rhdr.flags & DCERPC_PFC_FLAG_FIRST)
 	    && (state->rhdr.pack_type[0] == 0)) {
 		/*
 		 * Set the data type correctly for big-endian data on the
@@ -1433,7 +1433,7 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
 		return;
 	}
 
-	if (state->rhdr.flags & RPC_FLG_LAST) {
+	if (state->rhdr.flags & DCERPC_PFC_FLAG_LAST) {
 		DEBUG(10,("rpc_api_pipe: %s returned %u bytes.\n",
 			  rpccli_pipe_txt(debug_ctx(), state->cli),
 			  (unsigned)prs_data_size(&state->incoming_pdu)));
@@ -1679,7 +1679,7 @@ static NTSTATUS create_schannel_auth_rpc_bind_req( struct rpc_pipe_client *cli,
  Creates the internals of a DCE/RPC bind request or alter context PDU.
  ********************************************************************/
 
-static NTSTATUS create_bind_or_alt_ctx_internal(enum RPC_PKT_TYPE pkt_type,
+static NTSTATUS create_bind_or_alt_ctx_internal(enum dcerpc_pkt_type pkt_type,
 						prs_struct *rpc_out, 
 						uint32 rpc_call_id,
 						const struct ndr_syntax_id *abstract,
@@ -1714,7 +1714,7 @@ static NTSTATUS create_bind_or_alt_ctx_internal(enum RPC_PKT_TYPE pkt_type,
 	}
 
 	/* Create the request RPC_HDR */
-	init_rpc_hdr(&hdr, pkt_type, RPC_FLG_FIRST|RPC_FLG_LAST, rpc_call_id, frag_len, auth_len);
+	init_rpc_hdr(&hdr, pkt_type, DCERPC_PFC_FLAG_FIRST|DCERPC_PFC_FLAG_LAST, rpc_call_id, frag_len, auth_len);
 
 	/* Marshall the RPC header */
 	if(!smb_io_rpc_hdr("hdr"   , &hdr, rpc_out, 0)) {
@@ -1818,7 +1818,7 @@ static NTSTATUS create_rpc_bind_req(struct rpc_pipe_client *cli,
 			return NT_STATUS_INVALID_INFO_CLASS;
 	}
 
-	ret = create_bind_or_alt_ctx_internal(RPC_BIND,
+	ret = create_bind_or_alt_ctx_internal(DCERPC_PKT_BIND,
 						rpc_out, 
 						rpc_call_id,
 						abstract,
@@ -2126,7 +2126,7 @@ struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
 	if (is_last_frag) {
 		subreq = rpc_api_pipe_send(state, ev, state->cli,
 					   &state->outgoing_frag,
-					   RPC_RESPONSE);
+					   DCERPC_PKT_RESPONSE);
 		if (subreq == NULL) {
 			goto fail;
 		}
@@ -2172,11 +2172,11 @@ static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
 		state->cli, data_left, &frag_len, &auth_len, &ss_padding);
 
 	if (state->req_data_sent == 0) {
-		flags = RPC_FLG_FIRST;
+		flags = DCERPC_PFC_FLAG_FIRST;
 	}
 
 	if (data_sent_thistime == data_left) {
-		flags |= RPC_FLG_LAST;
+		flags |= DCERPC_PFC_FLAG_LAST;
 	}
 
 	if (!prs_set_offset(&state->outgoing_frag, 0)) {
@@ -2184,7 +2184,7 @@ static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
 	}
 
 	/* Create and marshall the header and request header. */
-	init_rpc_hdr(&hdr, RPC_REQUEST, flags, state->call_id, frag_len,
+	init_rpc_hdr(&hdr, DCERPC_PKT_REQUEST, flags, state->call_id, frag_len,
 		     auth_len);
 
 	if (!smb_io_rpc_hdr("hdr    ", &hdr, &state->outgoing_frag, 0)) {
@@ -2232,7 +2232,7 @@ static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
 	}
 
 	state->req_data_sent += data_sent_thistime;
-	*is_last_frag = ((flags & RPC_FLG_LAST) != 0);
+	*is_last_frag = ((flags & DCERPC_PFC_FLAG_LAST) != 0);
 
 	return status;
 }
@@ -2262,7 +2262,7 @@ static void rpc_api_pipe_req_write_done(struct tevent_req *subreq)
 	if (is_last_frag) {
 		subreq = rpc_api_pipe_send(state, state->ev, state->cli,
 					   &state->outgoing_frag,
-					   RPC_RESPONSE);
+					   DCERPC_PKT_RESPONSE);
 		if (tevent_req_nomem(subreq, req)) {
 			return;
 		}
@@ -2419,7 +2419,7 @@ static NTSTATUS create_rpc_bind_auth3(struct rpc_pipe_client *cli,
 	uint32 pad = 0;
 
 	/* Create the request RPC_HDR */
-	init_rpc_hdr(&hdr, RPC_AUTH3, RPC_FLG_FIRST|RPC_FLG_LAST, rpc_call_id,
+	init_rpc_hdr(&hdr, DCERPC_PKT_AUTH3, DCERPC_PFC_FLAG_FIRST|DCERPC_PFC_FLAG_LAST, rpc_call_id,
 		     RPC_HEADER_LEN + 4 /* pad */ + RPC_HDR_AUTH_LEN + pauth_blob->length,
 		     pauth_blob->length );
 
@@ -2492,7 +2492,7 @@ static NTSTATUS create_rpc_alter_context(uint32 rpc_call_id,
 		}
 	}
 
-	ret = create_bind_or_alt_ctx_internal(RPC_ALTCONT,
+	ret = create_bind_or_alt_ctx_internal(DCERPC_PKT_ALTER,
 						rpc_out, 
 						rpc_call_id,
 						abstract,
@@ -2573,7 +2573,7 @@ struct tevent_req *rpc_pipe_bind_send(TALLOC_CTX *mem_ctx,
 	}
 
 	subreq = rpc_api_pipe_send(state, ev, cli, &state->rpc_out,
-				   RPC_BINDACK);
+				   DCERPC_PKT_BIND_ACK);
 	if (subreq == NULL) {
 		goto fail;
 	}
@@ -2841,7 +2841,7 @@ static NTSTATUS rpc_finish_spnego_ntlmssp_bind_send(struct tevent_req *req,
 	}
 
 	subreq = rpc_api_pipe_send(state, state->ev, state->cli,
-				   &state->rpc_out, RPC_ALTCONTRESP);
+				   &state->rpc_out, DCERPC_PKT_ALTER_RESP);
 	if (subreq == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}