diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-08-06 21:34:00 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-08-07 15:40:20 +0200 |
| commit | b3573ce76eb053bf262b4ddea5a0fedf416d1ede (patch) | |
| tree | 4f934dfe3f08c3d46cd0799b8861de2e90e78587 | |
| parent | fd84beb19454963b4ded2b5aed2ed04a511cb397 (diff) | |
| download | samba-b3573ce76eb053bf262b4ddea5a0fedf416d1ede.tar.gz samba-b3573ce76eb053bf262b4ddea5a0fedf416d1ede.tar.bz2 samba-b3573ce76eb053bf262b4ddea5a0fedf416d1ede.zip | |
librpc/rpc: pass struct dcerpc_pipe to dcerpc_auth3()
metze
(This used to be commit 60b3523da485d845b1d930d990688d8434d39ef3)
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 13 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_auth.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 4758189d3b..33a8ed569a 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -790,30 +790,33 @@ NTSTATUS dcerpc_bind_recv(struct composite_context *ctx) /* perform a continued bind (and auth3) */ -NTSTATUS dcerpc_auth3(struct dcerpc_connection *c, +NTSTATUS dcerpc_auth3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) { struct ncacn_packet pkt; NTSTATUS status; DATA_BLOB blob; - init_ncacn_hdr(c, &pkt); + init_ncacn_hdr(p->conn, &pkt); pkt.ptype = DCERPC_PKT_AUTH3; pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST; - pkt.call_id = next_call_id(c); + pkt.call_id = next_call_id(p->conn); pkt.auth_length = 0; pkt.u.auth3._pad = 0; pkt.u.auth3.auth_info = data_blob(NULL, 0); /* construct the NDR form of the packet */ - status = ncacn_push_auth(&blob, mem_ctx, c->iconv_convenience, &pkt, c->security_state.auth_info); + status = ncacn_push_auth(&blob, mem_ctx, + p->conn->iconv_convenience, + &pkt, + p->conn->security_state.auth_info); if (!NT_STATUS_IS_OK(status)) { return status; } /* send it on its way */ - status = c->transport.send_request(c, &blob, false); + status = p->conn->transport.send_request(p->conn, &blob, false); if (!NT_STATUS_IS_OK(status)) { return status; } diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c index f990029f1d..661cd13c5a 100644 --- a/source4/librpc/rpc/dcerpc_auth.c +++ b/source4/librpc/rpc/dcerpc_auth.c @@ -146,7 +146,7 @@ static void bind_auth_next_step(struct composite_context *c) if (!more_processing) { /* NO reply expected, so just send it */ - c->status = dcerpc_auth3(state->pipe->conn, state); + c->status = dcerpc_auth3(state->pipe, state); if (!composite_is_ok(c)) return; composite_done(c); |