mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-27 03:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#9468 always init lc_time and lc_create_time

Browse Source 
Doesn't cost us anything and guarantees expiry will work if conn_ttl
or idletimeout are configured at a later time.
This commit is contained in:
Howard Chu 2021-05-25 20:02:45 +01:00 committed by Quanah Gibson-Mount
parent 4de2314555
commit 2f880087c9
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
servers/slapd/back-ldap/bind.c
View File

@ -658,7 +658,6 @@ ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_
#ifdef HAVE_TLS #ifdef HAVE_TLS
int is_tls = op->o_conn->c_is_tls; int is_tls = op->o_conn->c_is_tls;
int flags = li->li_flags; int flags = li->li_flags;
time_t lctime = (time_t)(-1);
slap_bindconf *sb; slap_bindconf *sb;
#endif /* HAVE_TLS */ #endif /* HAVE_TLS */
@ -744,10 +743,6 @@ ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_
ldap_unbind_ext( ld, NULL, NULL ); ldap_unbind_ext( ld, NULL, NULL );
rs->sr_text = "Start TLS failed"; rs->sr_text = "Start TLS failed";
goto error_return; goto error_return;
} else if ( li->li_idle_timeout ) {
/* only touch when activity actually took place... */
lctime = op->o_time;
} }
#endif /* HAVE_TLS */ #endif /* HAVE_TLS */
@ -759,9 +754,6 @@ ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_
} else { } else {
LDAP_BACK_CONN_ISTLS_CLEAR( lc ); LDAP_BACK_CONN_ISTLS_CLEAR( lc );
} }
if ( lctime != (time_t)(-1) ) {
lc->lc_time = lctime;
}
#endif /* HAVE_TLS */ #endif /* HAVE_TLS */
error_return:; error_return:;
@ -775,9 +767,8 @@ error_return:;
} }
} else { } else {
if ( li->li_conn_ttl > 0 ) { lc->lc_create_time = op->o_time;
lc->lc_create_time = op->o_time; lc->lc_time = op->o_time;
}
} }
return rs->sr_err; return rs->sr_err;
@ -3230,4 +3221,4 @@ ldap_back_schedule_conn_expiry( ldapinfo_t *li, ldapconn_t *lc ) {
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
return; return;
} }