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

[Steve Langasek]

Author: vorlon
Date: 2008-01-11 04:51:34 +0000 (Fri, 11 Jan 2008)
New Revision: 970

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.postinst
   openldap/trunk/debian/slapd.scripts-common
Log:
* "schemacheck" directives are no longer supported; comment them out
  on upgrade since this option was set by default in sarge.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-01-11 01:46:29 UTC (rev 969)
+++ openldap/trunk/debian/changelog	2008-01-11 04:51:34 UTC (rev 970)
@@ -56,6 +56,8 @@
   * "checkpoint" directives are no longer supported as part of the backend
     config, only as part of the database config; move the lines around in
     slapd.conf on upgrade.
+  * "schemacheck" directives are no longer supported; comment them out
+    on upgrade since this option was set by default in sarge.
 
   [ Russ Allbery ]
   * Removed fix_ldif and all remaining code to try running it on LDIF

Modified: openldap/trunk/debian/slapd.postinst
===================================================================
--- openldap/trunk/debian/slapd.postinst	2008-01-11 01:46:29 UTC (rev 969)
+++ openldap/trunk/debian/slapd.postinst	2008-01-11 04:51:34 UTC (rev 970)
@@ -45,6 +45,7 @@
 
 	if previous_version_older 2.4.7-1; then
 		migrate_bdb_checkpoint
+		config_obsolete_schemacheck
 	fi
 
 	if database_format_changed; then

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2008-01-11 01:46:29 UTC (rev 969)
+++ openldap/trunk/debian/slapd.scripts-common	2008-01-11 04:51:34 UTC (rev 970)
@@ -747,6 +747,13 @@
 } 
 
 # }}}
+config_obsolete_schemacheck() {						# {{{
+# comment out any occurences of "schemacheck" options in the config,
+# as this option is obsolete with OpenLDAP 2.4
+	write_slapd_conf "$SLAPD_CONF" "s|^(schemacheck\s+)|#\$1|"
+}
+
+# }}}
 update_path_argsfile_pidfile() {	# {{{
 	# If $SLAPD_CONF is a directory, the user is using cn=config.  Assume
 	# they know what they're doing.