ITS#6486 - avoid explicit moduleload in examples

diff --git a/doc/guide/admin/backends.sdf b/doc/guide/admin/backends.sdf
index ab2f30f1be7ec596faa23f1ca90342108c908328..e92d19540ae93acd99da254cafc3c4cb9af404ff 100644 (file)
--- 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 104582af35c67d379cb1d9c7ca5e146b1391d5e8..fb8707a9a6c38d763a490972eeac096245f45d0e 100644 (file)
--- 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"