[Pkg-openldap-devel] [openldap] 06/17: Change fix_ldif to not chew up everything that has a # in the line: treat lines beginning with # as comments, but # is a valid character in a value.

[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-5
in repository openldap.

commit 177ed34ca7c3fa71f1260010651f58dbec3cf996
Author: Steve Langasek <vorlon at debian.org>
Date:   Fri Apr 22 10:26:12 2005 +0000

    Change fix_ldif to not chew up everything that has a # in the line: treat
    lines beginning with # as comments, but # is a valid character in a value.
---
 debian/changelog |    3 +++
 debian/fix_ldif  |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e0e34ed..fcbdd95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ openldap2.2 (2.2.23-4) unstable; urgency=low
     limited use because it only fixes those attributes that we have
     prior knowledge of (i.e., those in the default schemas we ship), but
     it's something at least.  Closes: #302629.
+  * Also change fix_ldif to not chew up everything that has a # in the
+    line: treat lines beginning with # as comments, but # is a valid
+    character in a value.
   * Fix the check for missing lib symbols to use LD_LIBRARY_PATH, so the
     package builds on systems that don't already have libldap-2.2-7
     installed.  Closes: #305785.
diff --git a/debian/fix_ldif b/debian/fix_ldif
index 54c49f3..7a78c90 100644
--- a/debian/fix_ldif
+++ b/debian/fix_ldif
@@ -602,7 +602,7 @@ sub GetEntry
 	$_ = (<>);
 	return () if !defined;	# EOF
 	s/$/\n/;	# In case we strip last newline below
-	s/#.*\n//g;	# Comments
+	s/^#.*\n//g;	# Comments
 	chomp;		# Always strips >= 2 newlines
 	s/\n //g;	# Join lines
 	@a = split /\n/;

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