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

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

Author: arthur
Date: Tue Aug 17 18:52:02 2010
New Revision: 1177
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1177

Log:
only offer to fix nsswitch.conf if PAM has been converted with pam-auth-update

Modified:
   nss-pam-ldapd/debian/libpam-ldapd.postinst

Modified: nss-pam-ldapd/debian/libpam-ldapd.postinst
==============================================================================
--- nss-pam-ldapd/debian/libpam-ldapd.postinst  Tue Aug 17 18:40:05 2010        
(r1176)
+++ nss-pam-ldapd/debian/libpam-ldapd.postinst  Tue Aug 17 18:52:02 2010        
(r1177)
@@ -34,8 +34,10 @@
 
 # if /etc/nsswitch.conf contains passwd: ..ldap but not shadow: ...ldap
 # warn the user that this will not work and offer to fix it
+# (only do this if it seems we have switched to pam-auth-update)
 if grep -q '^passwd:.*ldap' /etc/nsswitch.conf && \
-   ! grep -q '^shadow:.*ldap' /etc/nsswitch.conf
+   ! grep -q '^shadow:.*ldap' /etc/nsswitch.conf && \
+   grep -q pam-auth-update /etc/pam.d/common-auth
 then
   if db_input critical libpam-ldapd/enable_shadow
   then
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits