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

[vorlon at alioth.debian.org]

tags 595784 pending
thanks

Author: vorlon
Date: 2010-09-13 03:12:19 +0000 (Mon, 13 Sep 2010)
New Revision: 1325

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.scripts-common
Log:
debian/slapd.scripts-common: when parsing the names of includes, handle
double-quotes and escape characters as described in slapd.conf(5).
Closes: #595784.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-09-13 01:01:36 UTC (rev 1324)
+++ openldap/trunk/debian/changelog	2010-09-13 03:12:19 UTC (rev 1325)
@@ -25,6 +25,9 @@
     separate responses by newlines, to properly handle the case when a
     DN has embedded spaces.  Introduces a few more stupid fd tricks to work
     around possible problems with debconf.  Closes: #595466.
+  * debian/slapd.scripts-common: when parsing the names of includes, handle
+    double-quotes and escape characters as described in slapd.conf(5).
+    Closes: #595784.
 
   [ Matthijs Mohlmann ]
   * Remove upgrade_supported_from_backend, implemented patch from

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-09-13 01:01:36 UTC (rev 1324)
+++ openldap/trunk/debian/slapd.scripts-common	2010-09-13 03:12:19 UTC (rev 1325)
@@ -281,7 +281,9 @@
 		       /^database/ { DB=1; SUF=""; DIR="" } ; 
 		       DB==1 && /^suffix[ \t]+"?'"$1"'"?$/ { SUF=$2 ; } ; 
 		       DB==1 && /^directory/ { DIR=$2 ;} ; 
-		       DB==1 && SUF!="" && DIR!="" { sub(/^"/,"",DIR) ; sub(/"$/,"",DIR) ; print DIR; SUF=""; DIR="" }' "${f}"
+		       DB==1 && SUF!="" && DIR!="" { sub(/^"/,"",DIR) ; sub(/"$/,"",DIR) ; print DIR; SUF=""; DIR="" }' "${f}" | \
+		sed -e's/\([^\\]\|^\)"/\1/g; s/\\"/"/g; s/\\\\/\\/g'
+
 		done
 	else
 		return 1