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

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

Author: arthur
Date: Fri Apr 27 11:09:02 2012
New Revision: 1667
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1667&view=revision

Log:
drop functionality to check whether shadow information is exposed in 
/etc/nsswitch.conf, it was no longer needed sine 0.8.4

Deleted:
   debian/nss-pam-ldapd/trunk/debian/libpam-ldapd.lintian-overrides
   debian/nss-pam-ldapd/trunk/debian/libpam-ldapd.templates
Modified:
   debian/nss-pam-ldapd/trunk/debian/changelog
   debian/nss-pam-ldapd/trunk/debian/libnss-ldapd.postinst
   debian/nss-pam-ldapd/trunk/debian/libnss-ldapd.postrm
   debian/nss-pam-ldapd/trunk/debian/libpam-ldapd.postinst

Modified: debian/nss-pam-ldapd/trunk/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/changelog Fri Apr 27 11:05:38 2012        
(r1666)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Fri Apr 27 11:09:02 2012        
(r1667)
@@ -7,8 +7,10 @@
     type, not the debconf database (closes: #670133)
   * switch PAM account type to primary because it now does all the
     authorisation checks that pam_unix also does
+  * drop functionality to check whether shadow information is exposed
+    in /etc/nsswitch.conf, it was no longer needed sine 0.8.4
 
- -- Arthur de Jong <adejong@debian.org>  Fri, 27 Apr 2012 11:00:00 +0200
+ -- Arthur de Jong <adejong@debian.org>  Fri, 27 Apr 2012 11:05:00 +0200
 
 nss-pam-ldapd (0.8.7-1) unstable; urgency=low
 

Modified: debian/nss-pam-ldapd/trunk/debian/libnss-ldapd.postinst
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/libnss-ldapd.postinst     Fri Apr 27 
11:05:38 2012        (r1666)
+++ debian/nss-pam-ldapd/trunk/debian/libnss-ldapd.postinst     Fri Apr 27 
11:09:02 2012        (r1667)
@@ -7,8 +7,7 @@
 
 # check whether the name is configure to do lookups through
 # LDAP
-# Note: this function is in libnss-ldapd.postinst, libnss-ldapd.postrm
-#       and libpam-ldapd.postinst
+# Note: this function is in libnss-ldapd.postinst and libnss-ldapd.postrm
 nss_is_enabled()
 {
   name="$1"
@@ -17,7 +16,6 @@
 
 # check to see if name is configured to do lookups through
 # LDAP and enable if not
-# Note: this function is in libnss-ldapd.postinst and libpam-ldapd.postinst
 nss_enable()
 {
   name="$1"

Modified: debian/nss-pam-ldapd/trunk/debian/libnss-ldapd.postrm
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/libnss-ldapd.postrm       Fri Apr 27 
11:05:38 2012        (r1666)
+++ debian/nss-pam-ldapd/trunk/debian/libnss-ldapd.postrm       Fri Apr 27 
11:09:02 2012        (r1667)
@@ -14,8 +14,7 @@
 
 # check whether the name is configure to do lookups through
 # LDAP
-# Note: this function is in libnss-ldapd.postinst, libnss-ldapd.postrm
-#       and libpam-ldapd.postinst
+# Note: this function is in libnss-ldapd.postinst and libnss-ldapd.postrm
 nss_is_enabled()
 {
   name="$1"

Modified: debian/nss-pam-ldapd/trunk/debian/libpam-ldapd.postinst
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/libpam-ldapd.postinst     Fri Apr 27 
11:05:38 2012        (r1666)
+++ debian/nss-pam-ldapd/trunk/debian/libpam-ldapd.postinst     Fri Apr 27 
11:09:02 2012        (r1667)
@@ -2,62 +2,6 @@
 
 set -e
 
-# source debconf library.
-. /usr/share/debconf/confmodule
-db_version 2.0
-
 #DEBHELPER#
 
 pam-auth-update --package
-
-# check whether the name is configure to do lookups through
-# LDAP
-# Note: this function is in libnss-ldapd.postinst, libnss-ldapd.postrm
-#       and libpam-ldapd.postinst
-nss_is_enabled()
-{
-  name="$1"
-  grep -q '^[[:space:]]*'$name'[[:space:]]*:.*ldap.*' /etc/nsswitch.conf
-}
-
-# check to see if name is configured to do lookups through
-# LDAP and enable if not
-# Note: this function is in libnss-ldapd.postinst and libpam-ldapd.postinst
-nss_enable()
-{
-  name="$1"
-  if ! nss_is_enabled "$name"
-  then
-    echo "/etc/nsswitch.conf: enable LDAP lookups for $name" >&2
-    if grep -q '^[[:space:]]*'$name'[[:space:]]*:' /etc/nsswitch.conf
-    then
-      # modify an existing entry by just adding ldap to the end
-      sed -i 
's/^\([[:space:]]*'$name'[[:space:]]*:.*[^[:space:]]\)[[:space:]]*$/\1 ldap/' 
/etc/nsswitch.conf
-    else
-      # append a new line
-      printf '%-15s ldap\n' $name':' >> /etc/nsswitch.conf
-    fi
-    # invalidate nscd cache
-    nscd -i "$name" > /dev/null 2>&1 || true
-  fi
-  # we're done
-  return 0
-}
-
-# 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 nss_is_enabled "passwd" && \
-   ! nss_is_enabled "shadow" && \
-   grep -q pam-auth-update /etc/pam.d/common-auth
-then
-  if db_input critical libpam-ldapd/enable_shadow
-  then
-    db_go
-    db_get libpam-ldapd/enable_shadow
-    if [ "$RET" = "true" ]
-    then
-      nss_enable "shadow"
-    fi
-  fi
-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/