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

[Steve Langasek]

Author: vorlon
Date: 2007-12-16 12:15:19 +0000 (Sun, 16 Dec 2007)
New Revision: 917

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.postinst
   openldap/trunk/debian/slapd.scripts-common
Log:
drop update_access_config_directives(), another function only needed for
upgrades from 2.1



Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2007-12-16 12:03:26 UTC (rev 916)
+++ openldap/trunk/debian/changelog	2007-12-16 12:15:19 UTC (rev 917)
@@ -31,7 +31,8 @@
   * Build-depend on libgnutls-dev instead of on libssl-dev, so that at long
     last we can build the server and lib from the same source package again
     without licensing problems.
-  * slapd.prerm: drop no-longer-needed upgrade code for openldap < 2.1.22
+  * slapd.prerm, slapd.postinst:: drop no-longer-needed upgrade code for
+    openldap < 2.1.22
   * Ask about ldbm to bdb migration in the preinst, since there is no
     guarantee that the debconf config script will be run before the unpack
     phase.

Modified: openldap/trunk/debian/slapd.postinst
===================================================================
--- openldap/trunk/debian/slapd.postinst	2007-12-16 12:03:26 UTC (rev 916)
+++ openldap/trunk/debian/slapd.postinst	2007-12-16 12:15:19 UTC (rev 917)
@@ -31,7 +31,6 @@
 	echo done. >&2
 
 	configure_v2_protocol_support
-	update_access_config_directives
 
 	if previous_version_older 2.3.25-1; then
 		update_path_argsfile_pidfile

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2007-12-16 12:03:26 UTC (rev 916)
+++ openldap/trunk/debian/slapd.scripts-common	2007-12-16 12:15:19 UTC (rev 917)
@@ -794,33 +794,6 @@
 	chown --reference="$1" "$2"
 }
 # }}}
-update_access_config_directives() {					# {{{
-# Update the config file for some changes done for 2.2.x (vs. 2.1.x):
-# access to attribute=<attr> becomes access to attrs=<attr>
-# access to dn=".*,..." becomes access to dn.regex=".*,..."
-
-	# Check if we have to apply these changes
-	# Users can have it in the config file. 2.2.26 allowed to have attr in the
-	# config files due to a bug in the config parser.
-	if previous_version_newer 2.3.24; then
-		return 0
-	fi
-
-	# Without a configuration we have nothing to update
-	if [ ! -e "$SLAPD_CONF" ]; then
-		echo >&2 \
-		  "  Did not find slapd.conf to update access directives."
-		return 0
-	fi
-
-	echo -n "  Updating config access directives... " >&2
-
-	write_slapd_conf "$SLAPD_CONF" 's/^(access\s+to\s+)dn=/$1dn.regex=/g'
-	write_slapd_conf "$SLAPD_CONF" 's/^(access\s+to\s+)(attribute=|attr=)/$1attrs=/g'
-
-	echo "done." >&2
-
-} # }}}
 stop_slapd() {								# {{{
 # Make sure slapd is shut down before mucking with the db files
 # and whatnot...