upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 08:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8270 use the configured exop timeout for StartTLS

Browse source 
Also, there's no need for a retry loop here. Just wait for
the specified timeout or give up.
This commit is contained in:
Howard Chu 2017-08-31 16:53:45 +01:00
parent 9e156bf914
commit bb62d9cb73
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-ldap/back-ldap.h
View file

@ -89,6 +89,7 @@ typedef struct ldapconn_base_t {
(BER_BVISEMPTY(&(op)->o_ndn) ? \ (BER_BVISEMPTY(&(op)->o_ndn) ? \
LDAP_BACK_PCONN_ANON_SET((lc), (op)) : LDAP_BACK_PCONN_ROOTDN_SET((lc), (op))) LDAP_BACK_PCONN_ANON_SET((lc), (op)) : LDAP_BACK_PCONN_ROOTDN_SET((lc), (op)))
struct ldapinfo_t *lcb_ldapinfo;
struct berval lcb_local_ndn; struct berval lcb_local_ndn;
unsigned lcb_refcnt; unsigned lcb_refcnt;
time_t lcb_create_time; time_t lcb_create_time;
@ -98,6 +99,7 @@ typedef struct ldapconn_base_t {
typedef struct ldapconn_t { typedef struct ldapconn_t {
ldapconn_base_t lc_base; ldapconn_base_t lc_base;
#define lc_conn lc_base.lcb_conn #define lc_conn lc_base.lcb_conn
#define lc_ldapinfo lc_base.lcb_ldapinfo
#define lc_local_ndn lc_base.lcb_local_ndn #define lc_local_ndn lc_base.lcb_local_ndn
#define lc_refcnt lc_base.lcb_refcnt #define lc_refcnt lc_base.lcb_refcnt
#define lc_create_time lc_base.lcb_create_time #define lc_create_time lc_base.lcb_create_time

29
servers/slapd/back-ldap/bind.c
View file

@ -530,7 +530,7 @@ ldap_back_start_tls(
int *is_tls, int *is_tls,
const char *url, const char *url,
unsigned flags, unsigned flags,
int retries, int timeout,
const char **text ) const char **text )
{ {
int rc = LDAP_SUCCESS; int rc = LDAP_SUCCESS;
@ -565,22 +565,14 @@ ldap_back_start_tls(
LDAPMessage *res = NULL; LDAPMessage *res = NULL;
struct timeval tv; struct timeval tv;
LDAP_BACK_TV_SET( &tv ); if ( timeout ) {
tv.tv_sec = timeout;
retry:; tv.tv_usec = 0;
} else {
LDAP_BACK_TV_SET( &tv );
}
rc = ldap_result( ld, msgid, LDAP_MSG_ALL, &tv, &res ); rc = ldap_result( ld, msgid, LDAP_MSG_ALL, &tv, &res );
if ( rc < 0 ) { if ( rc <= 0 ) {
rc = LDAP_UNAVAILABLE;
} else if ( rc == 0 ) {
if ( retries != LDAP_BACK_RETRY_NEVER ) {
ldap_pvt_thread_yield();
if ( retries > 0 ) {
retries--;
}
LDAP_BACK_TV_SET( &tv );
goto retry;
}
rc = LDAP_UNAVAILABLE; rc = LDAP_UNAVAILABLE;
} else if ( rc == LDAP_RES_EXTENDED ) { } else if ( rc == LDAP_RES_EXTENDED ) {
@ -752,7 +744,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_nretries, &rs->sr_text ); li->li_uri, flags, li->li_timeout[ SLAP_OP_EXTENDED ], &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 ) {
@ -978,6 +970,7 @@ retry_lock:
lc = (ldapconn_t *)ch_calloc( 1, sizeof( ldapconn_t ) ); lc = (ldapconn_t *)ch_calloc( 1, sizeof( ldapconn_t ) );
lc->lc_flags = li->li_flags; lc->lc_flags = li->li_flags;
lc->lc_lcflags = lc_curr.lc_lcflags; lc->lc_lcflags = lc_curr.lc_lcflags;
lc->lc_ldapinfo = li;
if ( ldap_back_prepare_conn( lc, op, rs, sendok ) != LDAP_SUCCESS ) { if ( ldap_back_prepare_conn( lc, op, rs, sendok ) != LDAP_SUCCESS ) {
ch_free( lc ); ch_free( lc );
return NULL; return NULL;
@ -1647,7 +1640,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,
LDAP_BACK_RETRY_DEFAULT, &text ); lc->lc_ldapinfo->li_timeout[ SLAP_OP_EXTENDED ], &text );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
return rc; return rc;
} }