Commit 9e35884f authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#8963 use BIND timeout for start_tls

Since we only support it in conjunction with Bind anyway, not
as a standalone op
parent 3a5ce78d
...@@ -746,7 +746,7 @@ ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_ ...@@ -746,7 +746,7 @@ ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_
assert( li->li_uri_mutex_do_not_lock == 0 ); assert( li->li_uri_mutex_do_not_lock == 0 );
li->li_uri_mutex_do_not_lock = 1; li->li_uri_mutex_do_not_lock = 1;
rs->sr_err = ldap_back_start_tls( ld, op->o_protocol, &is_tls, rs->sr_err = ldap_back_start_tls( ld, op->o_protocol, &is_tls,
li->li_uri, flags, li->li_timeout[ SLAP_OP_EXTENDED ], &rs->sr_text ); li->li_uri, flags, li->li_timeout[ SLAP_OP_BIND ], &rs->sr_text );
li->li_uri_mutex_do_not_lock = 0; li->li_uri_mutex_do_not_lock = 0;
ldap_pvt_thread_mutex_unlock( &li->li_uri_mutex ); ldap_pvt_thread_mutex_unlock( &li->li_uri_mutex );
if ( rs->sr_err != LDAP_SUCCESS ) { if ( rs->sr_err != LDAP_SUCCESS ) {
...@@ -1642,7 +1642,7 @@ ldap_back_default_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request, ...@@ -1642,7 +1642,7 @@ ldap_back_default_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
const char *text = NULL; const char *text = NULL;
rc = ldap_back_start_tls( ld, 0, &is_tls, url, lc->lc_flags, rc = ldap_back_start_tls( ld, 0, &is_tls, url, lc->lc_flags,
lc->lc_ldapinfo->li_timeout[ SLAP_OP_EXTENDED ], &text ); lc->lc_ldapinfo->li_timeout[ SLAP_OP_BIND ], &text );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
return rc; return rc;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment