nss-pam-ldapd commit: r1460 - nss-pam-ldapd/debian

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

Author: arthur
Date: Fri May 13 15:01:34 2011
New Revision: 1460
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1460

Log:
correctly pick up current configuration of /etc/nsswitch.conf when running 
dpkg-reconfigure

Modified:
   nss-pam-ldapd/debian/libnss-ldapd.config

Modified: nss-pam-ldapd/debian/libnss-ldapd.config
==============================================================================
--- nss-pam-ldapd/debian/libnss-ldapd.config    Fri May 13 14:41:17 2011        
(r1459)
+++ nss-pam-ldapd/debian/libnss-ldapd.config    Fri May 13 15:01:34 2011        
(r1460)
@@ -15,13 +15,14 @@
 
 # parse /etc/nsswitch.conf and see which services have ldap specified
 db_get libnss-ldapd/nsswitch
-if [ -z "$RET" ]
+# find name services that currently use LDAP
+configured=`sed -n 's/^\([a-z]*\):.*[[:space:]]ldap\([[:space:]].*\)\?/\1/p' 
/etc/nsswitch.conf`
+# separate by commas
+configured=`echo $configured | sed 's/ /, /g'`
+# store configured services either on first config or when ldap is already
+# configured
+if [ -z "$RET" ] || [ -n "$configured" ]
 then
-  # find name services that currently use LDAP
-  configured=`sed -n 's/^\([a-z]*\):.*[[:space:]]ldap\([[:space:]].*\)\?/\1/p' 
/etc/nsswitch.conf`
-  # separate by commas
-  configured=`echo $configured | sed 's/ /, /g'`
-  # store configured services
   db_set libnss-ldapd/nsswitch "$configured"
 fi
 
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits