ITS#8963 use BIND timeout for start_tls

Since we only support it in conjunction with Bind anyway, not
as a standalone op

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index cc04bed500f69d231020cc1531078f78bc6c02ae..3223f39641eeb46d4a89094076cc7a83772fb37e 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -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 );
        li->li_uri_mutex_do_not_lock = 1;
        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;
        ldap_pvt_thread_mutex_unlock( &li->li_uri_mutex );
        if ( rs->sr_err != LDAP_SUCCESS ) {
@@ -1642,7 +1642,7 @@ ldap_back_default_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
                const char      *text = NULL;
 
                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 ) {
                        return rc;
                }