mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

make back-meta conform with man page

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-01-14 15:28:28 +00:00
parent 63e80ef12e
commit d168b49464
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/back-meta/back-meta.h
View File

@ -230,7 +230,7 @@ typedef struct metatarget_t {
time_t mt_network_timeout;
time_t mt_idle_timeout;
struct timeval mt_bind_timeout;
#define META_BIND_TIMEOUT 10000
#define META_BIND_TIMEOUT LDAP_BACK_RESULT_UTIMEOUT
time_t mt_timeout[ LDAP_BACK_OP_LAST ];
} metatarget_t;

9
servers/slapd/back-meta/bind.c
View File

@ -337,7 +337,7 @@ retry:;
switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
case 0:
snprintf( buf, sizeof( buf ),
"ldap_result=0 nretries=%d%s\n",
"ldap_result=0 nretries=%d%s",
nretries, rebinding ? " rebinding" : "" );
Debug( LDAP_DEBUG_ANY,
"%s meta_back_single_bind[%d]: %s.\n",
@ -351,6 +351,7 @@ retry:;
tv = mt->mt_bind_timeout;
goto retry;
}
rs->sr_err = LDAP_BUSY;
if ( rebinding ) {
ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
@ -367,7 +368,7 @@ retry:;
case -1:
ldap_get_option( msc->msc_ld, LDAP_OPT_ERROR_NUMBER,
&rs->sr_err );
&rs->sr_err );
if ( rebinding ) {
ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
@ -522,8 +523,8 @@ retry:;
/* fallthru */
case -1:
ldap_get_option( msc->msc_ld,
LDAP_OPT_ERROR_NUMBER, &rs->sr_err );
ldap_get_option( msc->msc_ld, LDAP_OPT_ERROR_NUMBER,
&rs->sr_err );
if ( rebinding ) {
ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );