From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 17 Dec 2006 22:20:02 +0000 (+0000)
Subject: cleanup and document ITS#4781 commit
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef0261e84c5b5b7410c2c8c6537c172dbc2f2c14;p=thirdparty%2Fopenldap.git

cleanup and document ITS#4781 commit
---

diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5
index 03a99a1785..e0680e72bf 100644
--- a/doc/man/man5/slapd-ldap.5
+++ b/doc/man/man5/slapd-ldap.5
@@ -456,6 +456,13 @@ connection did.
 The \fBtry-\fP prefix instructs the proxy to continue operations
 if the StartTLS operation failed; its use is \fBnot\fP recommended.
 
+.TP
+.B use-temporary-conn {NO|yes}
+when set to 
+.BR yes ,
+create a temporary connection whenever competing with other threads
+for a shared one; otherwise, wait until the shared connection is available.
+
 .SH BACKWARD COMPATIBILITY
 The LDAP backend has been heavily reworked between releases 2.2 and 2.3,
 and subsequently between 2.3 and 2.4.
diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index ad2bf7c02c..1e2691d505 100644
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -278,7 +278,7 @@ static ConfigTable ldapcfg[] = {
 			"SYNTAX OMsDirectoryString "
 			"SINGLE-VALUE )",
 		NULL, NULL },
-	{ "use-temporaries", "TRUE/FALSE", 2, 0, 0,
+	{ "use-temporary-conn", "TRUE/FALSE", 2, 0, 0,
 		ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_USETEMP,
 		ldap_back_cf_gen, "( OLcfgDbAt:3.22 "
 			"NAME 'olcDbUseTemporaries' "