From 7cd8fbcca519ee90c84e84dd4fb2f348174e3092 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 13 Dec 2013 19:36:25 +0100 Subject: s4:libcli: make use of gensec_update_ev() Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- source4/libcli/ldap/ldap_bind.c | 2 +- source4/libcli/smb2/session.c | 4 ++-- source4/libcli/smb_composite/sesssetup.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c index d82b7a1156..a96ea9f6ae 100644 --- a/source4/libcli/ldap/ldap_bind.c +++ b/source4/libcli/ldap/ldap_bind.c @@ -327,7 +327,7 @@ try_logon_again: struct ldap_request *req; int result = LDAP_OTHER; - status = gensec_update(conn->gensec, tmp_ctx, + status = gensec_update_ev(conn->gensec, tmp_ctx, conn->event.event_ctx, input, &output); diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index 93b9896e7c..dfc607e0e8 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -152,7 +152,7 @@ struct tevent_req *smb2_session_setup_spnego_send( return tevent_req_post(req, ev); } - status = gensec_update(session->gensec, state, + status = gensec_update_ev(session->gensec, state, state->ev, negprot_secblob, &state->in_secblob); @@ -209,7 +209,7 @@ static void smb2_session_setup_spnego_done(struct tevent_req *subreq) peer_status = status; if (NT_STATUS_EQUAL(state->gensec_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { - status = gensec_update(session->gensec, state, + status = gensec_update_ev(session->gensec, state, state->ev, state->out_secblob, &state->in_secblob); diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c index f305a5e955..f7e92e5fb9 100644 --- a/source4/libcli/smb_composite/sesssetup.c +++ b/source4/libcli/smb_composite/sesssetup.c @@ -184,7 +184,7 @@ static void request_handler(struct smbcli_request *req) * host/attacker might avoid mutal authentication * requirements */ - state->gensec_status = gensec_update(session->gensec, state, c->event_ctx, + state->gensec_status = gensec_update_ev(session->gensec, state, c->event_ctx, state->setup.spnego.out.secblob, &state->setup.spnego.in.secblob); c->status = state->gensec_status; @@ -516,12 +516,12 @@ static NTSTATUS session_setup_spnego(struct composite_context *c, } if (strequal(chosen_oid, GENSEC_OID_SPNEGO)) { - status = gensec_update(session->gensec, state, + status = gensec_update_ev(session->gensec, state, c->event_ctx, session->transport->negotiate.secblob, &state->setup.spnego.in.secblob); } else { - status = gensec_update(session->gensec, state, + status = gensec_update_ev(session->gensec, state, c->event_ctx, data_blob(NULL, 0), &state->setup.spnego.in.secblob); -- cgit