[Pkg-openldap-devel] [openldap] 04/17: * Escape . and - when they appear in bracket expressions given to grep (closes: #302743).

Timo Aaltonen tjaalton-guest at alioth.debian.org
Thu Oct 10 05:35:57 UTC 2013


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 0851eefc8242babbbe94c9106c5c29e8a2870c1d
Author: Steve Langasek <vorlon at debian.org>
Date:   Fri Apr 22 09:13:00 2005 +0000

      * Escape . and - when they appear in bracket expressions given to grep
        (closes: #302743).
---
 debian/changelog            |    2 ++
 debian/slapd.scripts-common |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b65ae3a..e0e34ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ openldap2.2 (2.2.23-4) unstable; urgency=low
   * 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.
+  * Escape . and - when they appear in bracket expressions given to grep
+    (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 7e9435c..0a2da47 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



More information about the Pkg-openldap-devel mailing list