From fc949cc3c6fc245fca39c9d12d41abc728db2348 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 15 Apr 2010 20:25:41 +0000
Subject: [PATCH] ITS#6486

---
 CHANGES                      |  2 ++
 doc/guide/admin/backends.sdf | 32 +++++++++++++-------------------
 doc/guide/admin/overlays.sdf |  8 +-------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0efe5fb351..d493dee7a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,8 @@ OpenLDAP 2.4.22 Engineering
 	Fixed slapo-rwm REP_ENTRY flag handling (ITS#5340,ITS#6423)
 	Fixed slapo-syncprov memory leak (ITS#6459)
 	Fixed slapo-valsort REP_ENTRY flag handling (ITS#5340,ITS#6423)
+	Documentation
+		admin24 avoid explicity moduleload statements (ITS#6486)
 
 OpenLDAP 2.4.21 Release (2009/12/20)
 	Fixed liblutil for negative microsecond offsets (ITS#6405)
diff --git a/doc/guide/admin/backends.sdf b/doc/guide/admin/backends.sdf
index 33e1de1bcc..41c81fad73 100644
--- a/doc/guide/admin/backends.sdf
+++ b/doc/guide/admin/backends.sdf
@@ -4,6 +4,19 @@
 
 H1: Backends
 
+Backends do the actual work of storing or retrieving data in response
+to LDAP requests. Backends may be compiled statically into {{slapd}},
+or when module support is enabled, they may be dynamically loaded.
+
+If your installation uses dynamic modules, you may need to add the
+relevant {{moduleload}} directives to the examples that follow. The
+name of the module for a backend is usually of the form:
+
+>	back_<backend name>.la
+
+So for example, if you need to load the {{hdb}} backend, you would configure
+
+>	moduleload back_hdb.la
 
 H2: Berkeley DB Backends
 
@@ -131,13 +144,6 @@ configuration lines:
 >	rootdn    "cn=LDIF,dc=suretecsystems,dc=com"
 >	rootpw    LDIF
 
-You'll notice that when compared to examples below, there is no:
-
->   moduleload  back_ldif.la
-
-directive. This is because {{back_ldif}} is always built in by default as it is
-used by {{slapd-config(5)}}, which again is built in by default.
-
 If we add the {{dcObject}} for {{dc=suretecsystems,dc=com}}, you can see how this
 is added behind the scenes on the file system:
 
@@ -237,9 +243,6 @@ You can however set a {{rootdn}} and {{rootpw}}. The following is all that is
 needed to instantiate a monitor backend:
 
 >	include ./schema/core.schema
->
->	modulepath  /usr/local/libexec/openldap
->	moduleload  back_monitor.la
 >	
 >	database monitor
 >	rootdn "cn=monitoring,cn=Monitor"
@@ -308,16 +311,10 @@ H3: back-null Configuration
 This has to be one of the shortest configurations you'll ever do. In order to 
 test this, your {{F: slapd.conf}} file would look like:
 
->	modulepath  /usr/local/libexec/openldap
->	moduleload  back_null.la
-
 >	database null
 >	suffix "cn=Nothing"
 >	bind on
 
-The first two directives are only applicable if you've enabled module support and
-haven't "built-in" {{slapd-null(5)}} support (why would you?).
-
 {{bind on}} means:
 
 {{"Allow binds as any DN in this backend's suffix, with any password. The default is "off"."}}
@@ -362,9 +359,6 @@ example:
 
 >	include ./schema/core.schema
 >	
->	modulepath  /usr/local/libexec/openldap
->	moduleload  back_passwd.la
->	
 >	database passwd
 >	suffix "cn=passwd"
 
diff --git a/doc/guide/admin/overlays.sdf b/doc/guide/admin/overlays.sdf
index 57dd64d393..3c29daabe2 100644
--- a/doc/guide/admin/overlays.sdf
+++ b/doc/guide/admin/overlays.sdf
@@ -613,8 +613,7 @@ specific database. For example, with the following minimal slapd.conf:
 
 >        include /usr/share/openldap/schema/core.schema
 >        include /usr/share/openldap/schema/cosine.schema
->        modulepath      /usr/lib/openldap
->        moduleload      memberof.la
+>
 >        authz-regexp "gidNumber=0\\\+uidNumber=0,cn=peercred,cn=external,cn=auth"
 >                "cn=Manager,dc=example,dc=com"
 >        database        bdb
@@ -1175,11 +1174,6 @@ First we configure the overlay in the normal manner:
 >       pidfile     ./slapd.pid
 >       argsfile    ./slapd.args
 >       
->       modulepath  /usr/local/libexec/openldap
->       moduleload  back_bdb.la
->       moduleload  back_ldap.la
->       moduleload  translucent.la
->       
 >       database    bdb
 >       suffix      "dc=suretecsystems,dc=com"
 >       rootdn      "cn=trans,dc=suretecsystems,dc=com"
-- 
GitLab