make whitespace matching consistent in regular expressions (thanks Nick)

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1543 ef36b2f9-881f-0410-afb5-c4e39611909c

5 files changed, 8 insertions, 8 deletions

diff --git a/debian/libnss-ldapd.config b/debian/libnss-ldapd.config
index 4f8e2e7..2d759e8 100644
--- a/debian/libnss-ldapd.config
+++ b/debian/libnss-ldapd.config
@@ -27,7 +27,7 @@ db_get libnss-ldapd/nsswitch
 # find name services that currently use LDAP
 configured=`nss_list_configured`
 # separate by commas
-configured=`echo $configured | sed 's/ /, /g'`
+configured=`echo $configured | sed 's/[[:space:]][[:space:]]*/, /g'`
 # store configured services either on first config or when ldap is already
 # configured
 if [ -z "$RET" ] || [ -n "$configured" ]
diff --git a/debian/libnss-ldapd.postrm b/debian/libnss-ldapd.postrm
index cfa96ce..d66833d 100644
--- a/debian/libnss-ldapd.postrm
+++ b/debian/libnss-ldapd.postrm
@@ -60,7 +60,7 @@ then
       # ask with debconf
       . /usr/share/debconf/confmodule
       db_title "Removing libnss-ldapd"
-      db_subst libnss-ldapd/clean_nsswitch services "`echo $configured | sed 's/ /, /g'`"
+      db_subst libnss-ldapd/clean_nsswitch services "`echo $configured | sed 's/[[:space:]][[:space:]]*/, /g'`"
       db_fset libnss-ldapd/clean_nsswitch seen false
       if db_input high libnss-ldapd/clean_nsswitch
       then
diff --git a/debian/nslcd.config b/debian/nslcd.config
index da1dd52..c0154ce 100644
--- a/debian/nslcd.config
+++ b/debian/nslcd.config
@@ -41,7 +41,7 @@ get_domain()
   domain=`hostname --domain` || true
   [ -z "$domain" ] && domain=`hostname --nis | grep '\.'` || true
   [ -z "$domain" ] && domain=`hostname --fqdn | sed -n 's/^[^.]*\.//p'` || true
-  [ -z "$domain" ] && domain=`sed -n 's/^ *\(domain\|search\) *\([^ ]*\) *$/\2/p' /etc/resolv.conf | head -n 1` || true
+  [ -z "$domain" ] && domain=`sed -n 's/^[[:space:]]*\(domain\|search\)[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/\2/p' /etc/resolv.conf | head -n 1` || true
   echo "$domain"
 }
 
diff --git a/debian/nslcd.init b/debian/nslcd.init
index 562308d..a371a26 100644
--- a/debian/nslcd.init
+++ b/debian/nslcd.init
@@ -49,18 +49,18 @@ K5START_BIN=/usr/bin/k5start
 K5START_DESC="Keep alive Kerberos ticket"
 K5START_START=""
 K5START_PIDFILE=$NSLCD_STATEDIR/k5start_nslcd.pid
-K5START_USER=$(sed -n 's/^uid *\([^ ]*\) *$/\1/ip' $NSLCD_CFG)
-K5START_GROUP=$(sed -n 's/^gid *\([^ ]*\) *$/\1/ip' $NSLCD_CFG)
+K5START_USER=$(sed -n 's/^uid[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/\1/ip' $NSLCD_CFG)
+K5START_GROUP=$(sed -n 's/^gid[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/\1/ip' $NSLCD_CFG)
 K5START_MODE=600
 K5START_KEYTAB=/etc/krb5.keytab
 K5START_CCREFRESH=60
 K5START_PRINCIPAL="host/$(hostname -f)"
-K5START_CCFILE=$(sed -n 's/^krb5_ccname *\(FILE:\)\?\([^: ]*\) *$/\2/ip' $NSLCD_CFG)
+K5START_CCFILE=$(sed -n 's/^krb5_ccname[[:space:]]*\(FILE:\)\?\([^:[:space:]]*\)[[:space:]]*$/\2/ip' $NSLCD_CFG)
 
 # check if we should use k5start by default (sasl_mech should be GSSAPI and
 # krb5_ccname should be found)
 if [ -x "$K5START_BIN" ] && \
-   grep -q '^sasl_mech *GSSAPI$' $NSLCD_CFG && \
+   grep -q '^sasl_mech[[:space:]]*GSSAPI[[:space:]]*$' $NSLCD_CFG && \
    [ -n "$K5START_CCFILE" ]
 then
   K5START_START="yes"
diff --git a/debian/nslcd.postinst b/debian/nslcd.postinst
index 7262d88..1cda9b5 100644
--- a/debian/nslcd.postinst
+++ b/debian/nslcd.postinst
@@ -69,7 +69,7 @@ cfg_uris()
   # escape all uri directives
   sed -i 's/^uri /_uri_ /i' $CONFFILE
   # set the uri options
-  echo "$uris" | sed 's/^[ \t]*//;s/[ \t]*$//;s/  */\n/g' | while read uri
+  echo "$uris" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/[[:space:]][[:space:]]*/\n/g' | while read uri
   do
     if grep -qi '^_uri_ ' $CONFFILE
     then