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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2010-09-05 23:09:57 +0000 (Sun, 05 Sep 2010)
New Revision: 1311

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.scripts-common
Log:
* High-urgency upload for RC bugfix.
* debian/slapd.scripts-common: fix gratuitous (and wrong) use of grep in
  get_suffix(), which causes us to incorrectly parse any slapd.conf that
  uses tabs instead of spaces.  Closes; #595672.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-08-26 19:23:25 UTC (rev 1310)
+++ openldap/trunk/debian/changelog	2010-09-05 23:09:57 UTC (rev 1311)
@@ -1,3 +1,12 @@
+openldap (2.4.23-5) UNRELEASED; urgency=high
+
+  * High-urgency upload for RC bugfix.
+  * debian/slapd.scripts-common: fix gratuitous (and wrong) use of grep in
+    get_suffix(), which causes us to incorrectly parse any slapd.conf that
+    uses tabs instead of spaces.  Closes; #595672.
+
+ -- Steve Langasek <vorlon at debian.org>  Sun, 05 Sep 2010 16:08:53 -0700
+
 openldap (2.4.23-4) unstable; urgency=low
 
   [ Steve Langasek ]

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-08-26 19:23:25 UTC (rev 1310)
+++ openldap/trunk/debian/slapd.scripts-common	2010-09-05 23:09:57 UTC (rev 1311)
@@ -260,7 +260,7 @@
 get_suffix() {							
 	if [ -f "${SLAPD_CONF}" ]; then
 		for f in `get_all_slapd_conf_files`; do
-			grep '^suffix ' ${f} | sed 's/^suffix[[:space:]]\+\(.\+\)/\1/' | sed 's/"//g'
+			sed -n -e's/^suffix[[:space:]]\+"*\([^"]\+\)"*/\1/p' $f
 		done
 	else
 		grep -h olcSuffix ${SLAPD_CONF}/cn\=config/olcDatabase* | cut -d: -f 2