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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-07-15 15:26:26 +0000 (Tue, 15 Jul 2008)
New Revision: 1178

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.postinst
   openldap/trunk/debian/slapd.scripts-common
Log:
debian/slapd.scripts-common, debian/slapd.postinst: drop
update_path_argsfile_pidfile function, not needed for updates from etch
or newer.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-07-14 02:10:54 UTC (rev 1177)
+++ openldap/trunk/debian/changelog	2008-07-15 15:26:26 UTC (rev 1178)
@@ -4,6 +4,9 @@
   * New patch, CVE-2008-2952_BER-decoding-assertion, to fix a remote DoS
     vulnerability in the BER decoder.  Addresses CVE-2008-2952,
     closes: #488710.
+  * debian/slapd.scripts-common, debian/slapd.postinst: drop
+    update_path_argsfile_pidfile function, not needed for updates from etch
+    or newer.
 
   [ Russ Allbery ]
   * Apply upstream patch to convert GnuTLS cipher strength from bytes to

Modified: openldap/trunk/debian/slapd.postinst
===================================================================
--- openldap/trunk/debian/slapd.postinst	2008-07-14 02:10:54 UTC (rev 1177)
+++ openldap/trunk/debian/slapd.postinst	2008-07-15 15:26:26 UTC (rev 1178)
@@ -32,17 +32,6 @@
 
 	configure_v2_protocol_support
 
-	if previous_version_older 2.3.25-1; then
-		update_path_argsfile_pidfile
-
-		# Directory /var/run/slapd is suddenly gone, dpkg removes it
-		# because it's now generated from the postinst scripts. See
-		# create_ldap_directories.
-		if [ ! -d "/var/run/slapd" ]; then
-			mkdir -m 0755 /var/run/slapd
-		fi
-	fi
-
 	if previous_version_older 2.4.7-4; then
 		if ! migrate_checkpoint_and_slurpd; then
 			db_input critical slapd/slurpd_obsolete || true

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2008-07-14 02:10:54 UTC (rev 1177)
+++ openldap/trunk/debian/slapd.scripts-common	2008-07-15 15:26:26 UTC (rev 1178)
@@ -809,15 +809,6 @@
 }
 
 # }}}
-update_path_argsfile_pidfile() {	# {{{
-	# If $SLAPD_CONF is a directory, the user is using cn=config.  Assume
-	# they know what they're doing.
-	if [ -d "$SLAPD_CONF" ]; then return 0; fi
-
-	write_slapd_conf "$SLAPD_CONF" 's|^(argsfile\s+).*|$1/var/run/slapd/slapd.args|'
-	write_slapd_conf "$SLAPD_CONF" 's|^(pidfile\s+).*|$1/var/run/slapd/slapd.pid|'
-}
-# }}}
 configure_v2_protocol_support() {					# {{{
 # Adds the "allow bind_v2" directive to the configuration if the user decided
 # he wants to have ldap v2 enabled.