diff options
| -rw-r--r-- | source4/libnet/libnet_join.c | 11 | ||||
| -rw-r--r-- | source4/libnet/libnet_rpc.c | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 9eb0e6585d6..cd747cc5502 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -543,17 +543,6 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru samr_pipe = connect_with_info->out.dcerpc_pipe; - status = dcerpc_pipe_auth(tmp_ctx, &samr_pipe, - connect_with_info->out.dcerpc_pipe->binding, - &ndr_table_samr, ctx->cred, ctx->lp_ctx); - if (!NT_STATUS_IS_OK(status)) { - r->out.error_string = talloc_asprintf(mem_ctx, - "SAMR bind failed: %s", - nt_errstr(status)); - talloc_free(tmp_ctx); - return status; - } - /* prepare samr_Connect */ ZERO_STRUCT(p_handle); sc.in.system_name = NULL; diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c index ec1931795b6..a491a427ddc 100644 --- a/source4/libnet/libnet_rpc.c +++ b/source4/libnet/libnet_rpc.c @@ -825,7 +825,11 @@ static void continue_epm_map_binding(struct composite_context *ctx) } /* create secondary connection derived from lsa pipe */ - sec_conn_req = dcerpc_secondary_connection_send(s->lsa_pipe, s->final_binding); + sec_conn_req = dcerpc_secondary_auth_connection_send(s->lsa_pipe, + s->final_binding, + s->r.in.dcerpc_iface, + s->ctx->cred, + s->ctx->lp_ctx); if (composite_nomem(sec_conn_req, c)) return; composite_continue(c, sec_conn_req, continue_secondary_conn, c); @@ -844,7 +848,8 @@ static void continue_secondary_conn(struct composite_context *ctx) c = talloc_get_type(ctx->async.private_data, struct composite_context); s = talloc_get_type(c->private_data, struct rpc_connect_dci_state); - c->status = dcerpc_secondary_connection_recv(ctx, &s->final_pipe); + c->status = dcerpc_secondary_auth_connection_recv(ctx, s->lsa_pipe, + &s->final_pipe); if (!NT_STATUS_IS_OK(c->status)) { s->r.out.error_string = talloc_asprintf(c, "secondary connection failed: %s", |