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 bf6f611aa578148f891573458de315affa62f0ce..352c5014545e56f44003aca8f87c91d13a741652 100644 (file)
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -1,4 +1,3 @@
-# $OpenLDAP$
 #
 # See slapd.conf(5) for details on configuration options.
 # This file should NOT be world readable.
@@ -11,16 +10,13 @@ include             %SYSCONFDIR%/schema/core.schema
 # service AND an understanding of referrals.
 #referral      ldap://root.openldap.org
 
-pidfile                %LOCALSTATEDIR%/slapd.pid
-argsfile       %LOCALSTATEDIR%/slapd.args
+pidfile                %LOCALSTATEDIR%/run/slapd.pid
+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)
@@ -43,16 +39,18 @@ argsfile    %LOCALSTATEDIR%/slapd.args
 #      by users read
 #      by anonymous auth
 #
-# if no access controls are present, the default policy is:
-#      Allow read by all
+# if no access controls are present, the default policy
+# allows anyone and everyone to read anything but restricts
+# updates to rootdn.  (e.g., "access to * by * read")
 #
-# rootdn can always write!
+# rootdn can always read and write EVERYTHING!
 
 #######################################################################
-# ldbm database definitions
+# 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