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

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

Author: arthur
Date: Fri Nov 18 14:24:23 2011
New Revision: 1556
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1556&view=revision

Log:
simplification of logic to overwrite list of enabled /etc/nsswitch.conf 
services in debconf (based on r1555 of 0.7 branch)

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

Modified: nss-pam-ldapd/debian/libnss-ldapd.config
==============================================================================
--- nss-pam-ldapd/debian/libnss-ldapd.config    Fri Nov 18 14:02:07 2011        
(r1555)
+++ nss-pam-ldapd/debian/libnss-ldapd.config    Fri Nov 18 14:24:23 2011        
(r1556)
@@ -22,18 +22,10 @@
       /etc/nsswitch.conf
 }
 
-# parse /etc/nsswitch.conf and see which services have ldap specified
-db_get libnss-ldapd/nsswitch
-# find name services that currently use LDAP
-configured=`nss_list_configured`
-# separate by commas
-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" ]
-then
-  db_set libnss-ldapd/nsswitch "$configured"
-fi
+# find name services that currently use LDAP and separate by commas
+configured=`nss_list_configured | sed 's/[[:space:]][[:space:]]*/, /g'`
+# store configured services when ldap is already configured
+[ -n "$configured" ] && db_set libnss-ldapd/nsswitch "$configured"
 
 #
 # This is the second part of the script. In this part the configurable
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/