cleanup and document ITS#4781 commit

diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5
index 03a99a178583de8799c59ad0a3457896d5356737..e0680e72bf255f2566f279bd9954c4757c254405 100644 (file)
--- 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 ad2bf7c02c7ab61c88bbbb316b926a829f42f489..1e2691d505ab7ea837cb92fd3e4cf9bc1339fbe3 100644 (file)
--- 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' "