upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 18:18:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix handling of bind-timeout

Browse source
This commit is contained in:
Kurt Zeilenga 2005-12-21 17:59:39 +00:00
parent c7f42fa27e
commit 548ef1f0f9
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -17,8 +17,9 @@ OpenLDAP 2.3.14 Engineering
Fixed slapd-bdb/hdb cn=config reindexing (ITS#4260)
Fixed slapd-bdb/hdb cn=config olcDbIndex modify/replace (ITS#4262)
Fixed slapd-bdb/hdb lockup issue (ITS#4184)
Added slapd-ldap/meta idle-timeout support (ITS#4115)
Fixed slapd-ldap anonymous identity assertion (ITS#4272)
Added slapd-ldap/meta idle-timeout support (ITS#4115)
Fixed slapd-meta bind-timeout handling (ITS#xxxx)
Fixed slapo-rwm static DN free bug (ITS#4248)
Fixed slapo-syncprov unpublished control (ITS#4238)
Fixed slapo-syncprov message id issue

6
servers/slapd/back-meta/bind.c
View file

@ -342,7 +342,6 @@ rebind:;
* handle response!!!
*/
retry:;
tv = mt->mt_bind_timeout;
switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
case 0:
snprintf( buf, sizeof( buf ),
@ -357,7 +356,7 @@ retry:;
if ( nretries > 0 ) {
nretries--;
}
LDAP_BACK_TV_SET( &tv );
tv = mt->mt_bind_timeout;
goto retry;
}
rs->sr_err = LDAP_BUSY;
@ -498,7 +497,6 @@ rebind:;
* handle response!!!
*/
retry:;
tv = mt->mt_bind_timeout;
switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
case 0:
snprintf( buf, sizeof( buf ),
@ -513,7 +511,7 @@ retry:;
if ( nretries > 0 ) {
nretries--;
}
LDAP_BACK_TV_SET( &tv );
tv = mt->mt_bind_timeout;
goto retry;
}

6
tests/data/slapd-meta.conf
View file

@ -35,6 +35,10 @@ argsfile @TESTDIR@/slapd.m.args
#rwmmod#modulepath ../servers/slapd/overlays/
#rwmmod#moduleload rwm.la
# seems to improve behavior under very heavy load
# (i.e. it alleviates load on target systems)
threads 8
#######################################################################
# database definitions
#######################################################################
@ -59,4 +63,6 @@ suffixmassage "o=Example,c=US" "dc=example,dc=com"
pseudorootdn "cn=manager,dc=example,dc=com"
pseudorootpw secret
limits dn.exact="cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Example,c=US" time=1 size=8
#monitor#database monitor