[Pkg-openldap-devel] [openldap] 03/17: * debian/slapd.scripts-common: don't use merge_logical_lines for functions that will be writing back to the config; the code is not as pretty now, but the output is much less ugly.

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to annotated tag 2.2.23-3
in repository openldap.

commit 866ab42b23a2a7829e23dfa0c4e9a2ae9d7a57dc
Author: Steve Langasek <vorlon at debian.org>
Date:   Sun Apr 17 02:06:32 2005 +0000

      * debian/slapd.scripts-common: don't use merge_logical_lines for
        functions that will be writing back to the config; the code is not
        as pretty now, but the output is much less ugly.
---
 debian/changelog            |    5 ++++-
 debian/slapd.scripts-common |    9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7454845..23d021a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,11 @@ openldap2.2 (2.2.23-3) unstable; urgency=low
     segfaults on 64-bit platforms.  Closes: #304549.
   * debian/slapd.postinst: don't dump and reload directories unless we
     know we're upgrading from an incompatible version!  Closes: #304840.
+  * debian/slapd.scripts-common: don't use merge_logical_lines for
+    functions that will be writing back to the config; the code is not
+    as pretty now, but the output is much less ugly.
 
- -- Steve Langasek <vorlon at debian.org>  Sat, 16 Apr 2005 01:45:55 -0700
+ -- Steve Langasek <vorlon at debian.org>  Sat, 16 Apr 2005 19:01:19 -0700
 
 openldap2.2 (2.2.23-2) unstable; urgency=low
 
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index cc755f2..59b7060 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -732,10 +732,11 @@ update_access_config_directives() {					# {{{
 	echo -n "  Updating config access directives... " >&2
 	new_conf="`mktemp -q ${SLAPD_CONF}.XXXXXX`"
 
-	merge_logical_lines < "$SLAPD_CONF" | perl -p \
-		-e 'next if not m/^access\s+to/;' \
-		-e 's/dn=/dn.regex=/g;' \
-		-e 's/attribute=/attrs=/g;' >"$new_conf"
+	perl -p \
+		-e 'm/^\S/ && ($acl=0);' \
+		-e 'm/^access\s+to/ && ($acl=1);' \
+		-e 'if ($acl) { s/dn=/dn.regex=/g; s/attribute=/attrs=/g; }' \
+		< "$SLAPD_CONF" >"$new_conf"
 	install_new_slapd_conf "$new_conf"
 	echo done. >&2
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git