[Pkg-openldap-devel] [openldap] 01/01: remove trailing dot from slapd/domain (#637996)

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 4124c58d0f39c8a3b449fa948cd65cd29a2a8efb
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sat Sep 13 11:31:11 2014 -0700

    remove trailing dot from slapd/domain (#637996)
---
 debian/changelog            | 1 +
 debian/slapd.scripts-common | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d06c036..b608108 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ openldap (2.4.39-2) UNRELEASED; urgency=low
       contain other databases. Patch from Kenny Millington. (LP: #1003854)
     - Fix dumping and reloading when multiple databases hold the same suffix,
       thanks Peder Stray. (Closes: #759596, LP: #1362481)
+    - Remove trailing dot from slapd/domain. (Closes: #637996)
   * debian/rules:
     - Enable parallel building.
     - Copy libldap-2.4-2.shlibs into place manually, as a workaround for
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index a90d238..aed17e4 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -431,7 +431,7 @@ create_new_configuration() {						# {{{
 	# For the domain really.argh.org we create the basedn 
 	# dc=really,dc=argh,dc=org with the dc entry dc: really
 	db_get slapd/domain
-	basedn="dc=`echo $RET | sed 's/^\.//; s/\./,dc=/g'`"
+	basedn="dc=`echo $RET | sed 's/^\.//; s/\.$//; s/\./,dc=/g'`"
 	dc="`echo $RET | sed 's/^\.//; s/\..*$//'`"
 
 	db_get slapd/backend

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