ITS#5276 from HEAD

[openldap] / servers / slapd / slapd.conf

diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index cfdf733971fd6ee03626c6aebc2dc3ebca3caa6b..2531929648c75629be58c928650e7d837cb5c2b3 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,8 +10,8 @@ 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%
@@ -23,10 +22,6 @@ argsfile     %LOCALSTATEDIR%/slapd.args
 # moduleload   back_shell.la
 
 # Sample security restrictions
-#
-#   Disallow clear text exchange of passwords
-# disallow bind_simple_unprotected
-#
 #      Require integrity protection (prevent hijacking)
 #      Require 112-bit (3DES or better) encryption for updates
 #      Require 63-bit encryption for simple bind
@@ -34,24 +29,27 @@ argsfile    %LOCALSTATEDIR%/slapd.args
 
 # Sample access control policy:
 #      Root DSE: allow anyone to read it
+#      Subschema (sub)entry DSE: allow anyone to read it
 #      Other DSEs:
 #              Allow self write access
 #              Allow authenticated users read access
 #              Allow anonymous users to authenticate
 #      Directives needed to implement policy:
 # access to dn.base="" by * read
+# access to dn.base="cn=Subschema" by * read
 # access to *
 #      by self write
 #      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
@@ -62,7 +60,8 @@ rootdn                "cn=Manager,dc=my-domain,dc=com"
 # 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.
+# should only be accessible by the slapd and slap tools.
+# Mode 700 recommended.
 directory      %LOCALSTATEDIR%/openldap-data
 # Indices to maintain
 index  objectClass     eq