From: Martin Zobel-Helas <zobel@debian.org>
Date: Wed, 13 Jun 2012 22:10:50 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap
X-Git-Tag: userdir-ldap-0.3.85~61
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=60e335bcb88d3995e4cc7217829b1bad233f7c8c;hp=60e335bcb88d3995e4cc7217829b1bad233f7c8c;p=mirror%2Fuserdir-ldap.git

Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap

* 'master' of git+ssh://db.debian.org/git/userdir-ldap:
  fix
  userdir-ldap-slapd.conf.in: explicitly list readable attributes.  End with 'by * none'.
  ud-generate: Also rebuild if one of our keyrings has changed, even if ldap has not.
  ud-lock: support supplying a status to set instead of 'retiring'
---