[Pkg-openldap-devel] [openldap] 09/17: re-fix the grep expression, so that it actually works, thanks for checking Stephen :)

[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 d5aa6eef3086b189813764b4ed1a0a9aa44a2352
Author: Steve Langasek <vorlon at debian.org>
Date:   Sun Apr 24 04:25:09 2005 +0000

    re-fix the grep expression, so that it actually works, thanks for checking Stephen :)
---
 debian/changelog            |    7 +++++--
 debian/slapd.scripts-common |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac26f2a..e1423d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,11 @@ openldap2.2 (2.2.23-4) unstable; urgency=low
   * debian/rules: 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.
-  * debian/slapd.scripts-common: Escape . and - when they appear in
-    bracket expressions given to grep (closes: #302743).
+
+  Stephen Frost <sfrost at debian.org>:
+  * debian/slapd.scripts-common: Make sure - ends up at the end of the
+    bracket expression given to grep so it's not treated as a range
+    (closes: #302743).
 
  -- Steve Langasek <vorlon at debian.org>  Fri, 22 Apr 2005 01:53:27 -0700
 
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index 0a2da47..afce2ec 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -826,7 +826,7 @@ validate_initial_config() {
   # work, we would also need to Base64 encode it in the LDIF; since
   # we're not doing it at the moment, this should be fine for now
   db_get slapd/domain
-  if [ -z "$RET" ] || ! echo "$RET" | grep -q '^[a-zA-Z0-9\-\.]*$'; then
+  if [ -z "$RET" ] || ! echo "$RET" | grep -q '^[a-zA-Z0-9.-]*$'; then
     db_fset slapd/domain seen false
     invalid=true
   fi

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