From 3cbf0e80f1b17bc8fd8d0d6ee75c87b3d8ac881c Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 6 Jan 2011 22:40:11 +0000
Subject: [PATCH] More for ITS#6780

---
 CHANGES                     | 8 +++++---
 doc/man/man5/slapd-config.5 | 5 +++++
 doc/man/man5/slapd.conf.5   | 5 +++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index ecb7d8567e..0f97e978fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -121,9 +121,11 @@ OpenLDAP 2.4.24 Engineering
 		admin24 guide refint rootdn requirement (ITS#6364)
 		admin24 add pcache overlay section (ITS#6521)
 		ldap_open(3) document ldap_set_urllist_proc (ITS#6601)
-		ldap.conf(5) GNUTls cipher spec info (ITS#6525)
-		slapd.conf(5) GNUTls cipher spec info (ITS#6525)
-		slapd-config(5) GNUTls cipher spec info (ITS#6525)
+		ldap.conf(5) GnuTLS cipher spec info (ITS#6525)
+		slapd.conf(5) GnlTLS cipher spec info (ITS#6525)
+		slapd.conf(5) multi-listener support (ITS#6780)
+		slapd-config(5) GnuTLS cipher spec info (ITS#6525)
+		slapd-config(5) multi-listener support (ITS#6780)
 		slapo-pcache(5) note rootdn requirement (ITS#6522)
 		slapo-refint(5) rootdn requirement (ITS#6364)
 
diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index 5f05981629..23ff1e9a07 100644
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -508,6 +508,11 @@ changing these settings will generally require deleting any indices that
 depend on these parameters and recreating them with
 .BR slapindex (8).
 
+.TP
+.B olcListenerThreads: <integer>
+Specify the number of threads to use for the connection manager.
+The default is 1 and this is typically adequate for up to 16 CPU cores.
+The value should be set to a power of 2.
 .TP
 .B olcLocalSSF: <SSF>
 Specifies the Security Strength Factor (SSF) to be given local LDAP sessions,
diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 15ef8a4b28..e026815f3c 100644
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -564,6 +564,11 @@ is used, this configuration statement would result in an error,
 since no handlers would be associated to the resulting syntax structure.
 .RE
 
+.TP
+.B listener-threads <integer>
+Specify the number of threads to use for the connection manager.
+The default is 1 and this is typically adequate for up to 16 CPU cores.
+The value should be set to a power of 2.
 .TP
 .B localSSF <SSF>
 Specifies the Security Strength Factor (SSF) to be given local LDAP sessions,
-- 
GitLab