Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5

[openldap] / servers / slapd / slapd.conf

diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index 2531929648c75629be58c928650e7d837cb5c2b3..352c5014545e56f44003aca8f87c91d13a741652 100644 (file)
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -15,11 +15,8 @@ argsfile     %LOCALSTATEDIR%/run/slapd.args
 
 # Load dynamic backend modules:
 # modulepath   %MODULEDIR%
-# moduleload   back_bdb.la
+# moduleload   back_mdb.la
 # moduleload   back_ldap.la
-# moduleload   back_ldbm.la
-# moduleload   back_passwd.la
-# moduleload   back_shell.la
 
 # Sample security restrictions
 #      Require integrity protection (prevent hijacking)
@@ -52,7 +49,8 @@ argsfile      %LOCALSTATEDIR%/run/slapd.args
 # BDB database definitions
 #######################################################################
 
-database       bdb
+database       mdb
+maxsize                1073741824
 suffix         "dc=my-domain,dc=com"
 rootdn         "cn=Manager,dc=my-domain,dc=com"
 # Cleartext passwords, especially for the rootdn, should