]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:libcli/ldap: just use gensec_update() in ldap_bind_sasl()
authorStefan Metzmacher <metze@samba.org>
Mon, 15 May 2017 21:53:38 +0000 (23:53 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 21 May 2017 23:12:23 +0000 (01:12 +0200)
We're in a blocking/sync call, we should avoid using nested event loops for
this. As far as I can see ldap_bind_sasl() is only called from command line
tools, which are ok to block.

Resolving this requires also resolving the general case in LDB, as that is the
API this is used from.  We would need ldb_connect_send() and ldb_connect_recv()
at a start.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon May 22 01:12:23 CEST 2017 on sn-devel-144

source4/libcli/ldap/ldap_bind.c

index b8799dc6cde6d609997dad89bc59886139577587..66fe9f5ea92b113a28f965aeb24cb2a26732ed78 100644 (file)
@@ -379,8 +379,7 @@ try_logon_again:
                struct ldap_request *req;
                int result = LDAP_OTHER;
        
-               status = gensec_update_ev(conn->gensec, tmp_ctx,
-                                      conn->event.event_ctx,
+               status = gensec_update(conn->gensec, tmp_ctx,
                                       input,
                                       &output);
                /* The status value here, from GENSEC is vital to the security