s4:libcli: make use of gensec_update_ev()
authorStefan Metzmacher <metze@samba.org>
Fri, 13 Dec 2013 18:36:25 +0000 (19:36 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 26 Mar 2014 23:36:31 +0000 (00:36 +0100)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/libcli/ldap/ldap_bind.c
source4/libcli/smb2/session.c
source4/libcli/smb_composite/sesssetup.c

index d82b7a115651b7a4d0b1d9ed4c36e00bec615479..a96ea9f6aee4d9b67a0fdf49f896c2b85757fb38 100644 (file)
@@ -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);
index 93b9896e7cbd08a01749acb2dfb267f6f5ff3161..dfc607e0e83e993d4d65d1f34148996231da13c5 100644 (file)
@@ -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);
index f305a5e95528a4cf23a177ac7feba211d149a99c..f7e92e5fb99867ddb382bb404078eac18f3a4183 100644 (file)
@@ -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);