nss-pam-ldapd commit: r1599 - in nss-pam-ldapd-0.7.15+squeeze: . debian

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

Author: arthur
Date: Fri Jan 20 11:30:45 2012
New Revision: 1599
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1599&view=revision

Log:
fix an issues where changes to /etc/nsswitch.conf outside of debconf were not 
picked up (merged r1555 from 0.7 branch, like r1597 from 0.8)

Modified:
   nss-pam-ldapd-0.7.15+squeeze/   (props changed)
   nss-pam-ldapd-0.7.15+squeeze/debian/libnss-ldapd.config

Modified: nss-pam-ldapd-0.7.15+squeeze/debian/libnss-ldapd.config
==============================================================================
--- nss-pam-ldapd-0.7.15+squeeze/debian/libnss-ldapd.config     Fri Jan 20 
11:24:34 2012        (r1598)
+++ nss-pam-ldapd-0.7.15+squeeze/debian/libnss-ldapd.config     Fri Jan 20 
11:30:45 2012        (r1599)
@@ -14,11 +14,9 @@
 #
 
 # parse /etc/nsswitch.conf and see which services have ldap specified
-db_get libnss-ldapd/nsswitch
-if [ -z "$RET" ]
+configured=`sed -n 's/^\([a-z]*\):.*[[:space:]]ldap\([[:space:]].*\)\?/\1/p' 
/etc/nsswitch.conf`
+if [ -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
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/