On Thu, 2012-01-12 at 22:10 +0100, Julien Cristau wrote: > Any chance you could consider an upload with *just* the above change > (and a changelog entry), and without the version change noise in the > rest of your diff? I could do this but the other two functional changes, although not affecting many users, are bugs with simple and clear fixes. The range checking patch is a little bigger though. Is there any reason the other changes are inappropriate? I could upload a 0.7.15+squeeze1 package with just the one change (#645599, no version bumps) if you like but 0.7.16 would be easier for me to track versions. I'm planning on switching to non-native packaging to make these things simpler in the future. Attached is a debdiff for 0.7.15+squeeze1. Thanks. -- -- arthur - adejong@debian.org - http://people.debian.org/~adejong --
diff -Nru nss-pam-ldapd-0.7.15/debian/changelog nss-pam-ldapd-0.7.15+squeeze1/debian/changelog --- nss-pam-ldapd-0.7.15/debian/changelog 2011-10-02 11:14:58.000000000 +0200 +++ nss-pam-ldapd-0.7.15+squeeze1/debian/changelog 2012-01-15 09:36:25.000000000 +0100 @@ -1,3 +1,11 @@ +nss-pam-ldapd (0.7.15+squeeze1) stable; urgency=low + + * fix an issue where changes in /etc/nsswitch.conf were not correctly + picked up and could lead to lookups being disabled on upgrade + (closes: #645599) + + -- Arthur de Jong <adejong@debian.org> Sun, 15 Jan 2012 09:30:00 +0100 + nss-pam-ldapd (0.7.15) stable; urgency=low * in debconf, treat the "hard" value for tls_reqcert as if it was "demand" diff -Nru nss-pam-ldapd-0.7.15/debian/libnss-ldapd.config nss-pam-ldapd-0.7.15+squeeze1/debian/libnss-ldapd.config --- nss-pam-ldapd-0.7.15/debian/libnss-ldapd.config 2010-09-24 09:07:12.000000000 +0200 +++ nss-pam-ldapd-0.7.15+squeeze1/debian/libnss-ldapd.config 2012-01-15 09:29:32.000000000 +0100 @@ -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
Attachment:
signature.asc
Description: This is a digitally signed message part