use BDB and other updates

diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index fdc682fc77dddbdd47c80b4069170c615e1ae272..03db77e9f7309de84d2c26f2440ba129051ea7f6 100644 (file)
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -22,19 +22,19 @@ argsfile    %LOCALSTATEDIR%/slapd.args
 # moduleload   back_shell.la
 
 #
-# Sample Access Control
+# Sample access control policy:
 #      Allow read access of root DSE
 #      Allow self write access
 #      Allow authenticated users read access
 #      Allow anonymous users to authenticate
-#
+# Directives needed to implement policy:
 #access to dn="" by * read
 #access to *
 #      by self write
 #      by users read
 #      by anonymous auth
 #
-# if no access controls are present, the default is:
+# if no access controls are present, the default policy is:
 #      Allow read by all
 #
 # rootdn can always write!
@@ -43,17 +43,15 @@ argsfile    %LOCALSTATEDIR%/slapd.args
 # ldbm database definitions
 #######################################################################
 
-database       ldbm
+database       bdb
 suffix         "dc=my-domain,dc=com"
-#suffix                "o=My Organization Name,c=US"
 rootdn         "cn=Manager,dc=my-domain,dc=com"
-#rootdn                "cn=Manager,o=My Organization Name,c=US"
 # Cleartext passwords, especially for the rootdn, should
 # be avoid.  See slappasswd(8) and slapd.conf(5) for details.
 # Use of strong authentication encouraged.
 rootpw         secret
 # The database directory MUST exist prior to running slapd AND 
 # should only be accessible by the slapd/tools. Mode 700 recommended.
-directory      %LOCALSTATEDIR%/openldap-ldbm
+directory      %LOCALSTATEDIR%/openldap-data
 # Indices to maintain
 index  objectClass     eq