[Pkg-openldap-devel] r1322 - openldap/trunk/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2010-09-12 22:44:07 +0000 (Sun, 12 Sep 2010)
New Revision: 1322

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.default
Log:
debian/slapd.default: now that we have a sensible default behavior in
both slapd.init and the maintainer scripts, leave SLAPD_CONF empty to
save pain later.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-09-12 22:41:23 UTC (rev 1321)
+++ openldap/trunk/debian/changelog	2010-09-12 22:44:07 UTC (rev 1322)
@@ -15,6 +15,9 @@
     package can be removed gracefully.  Closes: #596100.
   * drop build-conflicts with libssl-dev; we explicitly pass
     --with-tls=gnutls to configure, so there's no risk of a misbuild here.
+  * debian/slapd.default: now that we have a sensible default behavior in
+    both slapd.init and the maintainer scripts, leave SLAPD_CONF empty to
+    save pain later.
 
   [ Matthijs Mohlmann ]
   * Remove upgrade_supported_from_backend, implemented patch from

Modified: openldap/trunk/debian/slapd.default
===================================================================
--- openldap/trunk/debian/slapd.default	2010-09-12 22:41:23 UTC (rev 1321)
+++ openldap/trunk/debian/slapd.default	2010-09-12 22:44:07 UTC (rev 1322)
@@ -1,8 +1,7 @@
-# Default location of the slapd.conf file. If empty, use the compiled-in
-# default (/etc/ldap/slapd.conf). If using the cn=config backend to store
-# configuration in LDIF, set this variable to the directory containing the
-# cn=config data.
-SLAPD_CONF="/etc/ldap/slapd.d"
+# Default location of the slapd.conf file or slapd.d cn=config directory. If
+# empty, use the compiled-in default (/etc/ldap/slapd.d with a fallback to
+# /etc/ldap/slapd.conf).
+SLAPD_CONF=
 
 # System account to run the slapd server under. If empty the server
 # will run as root.