summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-03-21 00:11:15 +0100
committerSimo Sorce <idra@samba.org>2010-07-07 23:45:50 -0400
commit8fdc02aa63d1a93de7e5008db4efb54e197afd17 (patch)
treee1e2dbe855c0f9edd49b0a38b81de6096483df95
parent3d9a12dca7e00e133702ea1d8d31e50eceac9039 (diff)
downloadsamba-8fdc02aa63d1a93de7e5008db4efb54e197afd17.tar.gz
samba-8fdc02aa63d1a93de7e5008db4efb54e197afd17.tar.bz2
samba-8fdc02aa63d1a93de7e5008db4efb54e197afd17.zip
s3-dcerpc: use dcerpc_push_ncacn_packet() for setup_bind_nak().
Guenther Signed-off-by: Simo Sorce <idra@samba.org>
-rw-r--r--source3/rpc_server/srv_pipe.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 3bc997ecbf..05351c9516 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -851,8 +851,9 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
static bool setup_bind_nak(pipes_struct *p)
{
- RPC_HDR nak_hdr;
- uint16 zero = 0;
+ NTSTATUS status;
+ union dcerpc_payload u;
+ DATA_BLOB blob;
/* Free any memory in the current return data buffer. */
prs_mem_free(&p->out_data.rdata);
@@ -869,24 +870,25 @@ static bool setup_bind_nak(pipes_struct *p)
* Initialize a bind_nak header.
*/
- init_rpc_hdr(&nak_hdr, DCERPC_PKT_BIND_NAK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
- p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
+ ZERO_STRUCT(u);
- /*
- * Marshall the header into the outgoing PDU.
- */
+ u.bind_nak.reject_reason = 0;
- if(!smb_io_rpc_hdr("", &nak_hdr, &p->out_data.frag, 0)) {
- DEBUG(0,("setup_bind_nak: marshalling of RPC_HDR failed.\n"));
+ status = dcerpc_push_ncacn_packet(p->mem_ctx,
+ DCERPC_PKT_BIND_NAK,
+ DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
+ RPC_HEADER_LEN + sizeof(uint16_t) /* FIXME - gd */,
+ 0,
+ p->hdr.call_id,
+ u,
+ &blob);
+ if (!NT_STATUS_IS_OK(status)) {
prs_mem_free(&p->out_data.frag);
return False;
}
- /*
- * Now add the reject reason.
- */
-
- if(!prs_uint16("reject code", &p->out_data.frag, 0, &zero)) {
+ if (!prs_copy_data_in(&p->out_data.frag,
+ (char *)blob.data, blob.length)) {
prs_mem_free(&p->out_data.frag);
return False;
}