nss-pam-ldapd commit: r2160 - debian/nss-pam-ldapd/trunk/debian

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Wed Jan 18 23:13:19 2017
New Revision: 2160
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=2160&view=revision

Log:
fix parsing of nslcd.conf tls_cacert option in package configuration (closes: 
#851564)

Modified:
   debian/nss-pam-ldapd/trunk/debian/changelog
   debian/nss-pam-ldapd/trunk/debian/nslcd.config

Modified: debian/nss-pam-ldapd/trunk/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/changelog Wed Sep  7 23:33:37 2016        
(r2159)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Wed Jan 18 23:13:19 2017        
(r2160)
@@ -3,8 +3,10 @@
   * recommend ca-certificate which is needed due to adding tls_cacertfile by
     default (see #750949) and the checking of tls_cacertfile in 0.9.7
     (closes: #836720)
+  * fix parsing of nslcd.conf tls_cacert option in package configuration
+    (closes: #851564)
 
- -- Arthur de Jong <adejong@debian.org>  Wed, 07 Sep 2016 23:10:45 +0200
+ -- Arthur de Jong <adejong@debian.org>  Tue, 17 Jan 2017 14:42:28 +0100
 
 nss-pam-ldapd (0.9.7-1) unstable; urgency=medium
 

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.config
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.config      Wed Sep  7 23:33:37 
2016        (r2159)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.config      Wed Jan 18 23:13:19 
2017        (r2160)
@@ -27,7 +27,7 @@
   if [ -z "$RET" ] || [ "$force" = "force" ]
   then
     # the first part avoids getting options that have an optional MAP parameter
-    cfgfile_value=`sed -n 
'/^'"$cfg_param"'[[:space:]]\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)[[:space:]]/!s/^'"$cfg_param"'[[:space:]]*\([^[:space:]].*[^[:space:]]\)[[:space:]]*$/\1/ip'
 "$cfgfile" | head -n 1`
+    cfgfile_value=`sed -n 
'/^'"$cfg_param"'[[:space:]][[:space:]]*\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)[[:space:]]/!s/^'"$cfg_param"'[[:space:]][[:space:]]*\([^[:space:]].*[^[:space:]]\)[[:space:]]*$/\1/ip'
 "$cfgfile" | head -n 1`
     [ -n "$cfgfile_value" ] && db_set "$debconf_param" "$cfgfile_value"
   fi
   # we're done
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
https://lists.arthurdejong.org/nss-pam-ldapd-commits/