From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 14 Jan 2006 15:28:28 +0000 (+0000)
Subject: make back-meta conform with man page
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~314
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d168b49464df8a034e244c6610721155aa6b42ba;p=openldap

make back-meta conform with man page
---

diff --git a/servers/slapd/back-meta/back-meta.h b/servers/slapd/back-meta/back-meta.h
index a667e86567..5e2dbaf78e 100644
--- a/servers/slapd/back-meta/back-meta.h
+++ b/servers/slapd/back-meta/back-meta.h
@@ -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;
 
diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 36e12ba0fc..0540c23ec3 100644
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -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 );