merge from alioth:

Make ud-useradd also not use hardcoded path
Use sync_keyrings from config instead of hardcoded list

diff --cc debian/changelog
index b717ecb,ac00d77..2c3b48f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,15 +1,58 @@@
 -userdir-ldap (0.3.25+common1) unstable; urgency=low
 -
 -  [ Martin Zobel-Helas ]
 -  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
++userdir-ldap (0.3.XX) Xnstable; urgency=low
+ 
+   [ Joerg Jaspert ]
+   * Use sync_keyrings from config file in ud-generate instead of a
+   hardcoded list
+   * Use add_keyrings from config file in ud-useradd instead of a
+   hardcoded list
+ 
 - -- Joerg Jaspert <joerg@debian.org>  Sun, 18 May 2008 13:32:01 +0200
++ -- Peter Palfrader <weasel@debian.org>  Fri, 23 May 2008 09:59:15 +0200
++
 +userdir-ldap (0.3.30) unstable; urgency=low
 +
 +  * When we touch usePassword in ud-info or ud-mailgate we now also
 +    update shadowLastChange.
 +  * When we lock accounts, set shadowExpire to 1.  shadowExpire
 +    is "days since Jan 1, 1970 that account is disabled".
 +  * Properly capitalize shadowInactive and shadowExpire attributes in
 +    ud-info and ud-generate.
 +  * Add copyright statements to ud-info from bzr log.
 +
 + -- Peter Palfrader <weasel@debian.org>  Thu, 22 May 2008 22:39:10 +0200
 +
 +userdir-ldap (0.3.29) unstable; urgency=low
 +
 +  * ud-info: Add an option "L" to lock accounts in the interactive
 +    interface.  Locking an account sets a user's password to "{crypt}*LK*"
 +    and sets a mailDisableMessage of "account locked".
 +
 + -- Peter Palfrader <weasel@debian.org>  Thu, 22 May 2008 21:49:19 +0200
 +
 +userdir-ldap (0.3.28) unstable; urgency=low
 +
 +  * ud-generate: Do not disable mail just because the account is locked.
 +
 + -- Peter Palfrader <weasel@debian.org>  Thu, 22 May 2008 21:38:56 +0200
 +
 +userdir-ldap (0.3.27) unstable; urgency=low
 +
 +  * Export ssh-keys.tar.gz to [UNTRUSTED] hosts.  Since we already export
 +    ssh-rsa-shadow this is probably the right thing.
 +  * Make keys in the ssh-keys tarball mode 0400 instead of mode 0600.
 +
 + -- Peter Palfrader <weasel@debian.org>  Mon, 19 May 2008 08:55:28 +0200
 +
 +userdir-ldap (0.3.26) unstable; urgency=low
 +
 +  * ud-replicate: sgran pointed out that if all we care about ignoring is
 +    EEXIST then we should use mkdir -p instead of [ -d userkeys ] || mkdir
 +    userkeys.
 +  * ud-mailgate: a bug in DoSSH caused all changes to fail that came after
 +    DoSSH in HandleChange.  Now DoSSH properly returns without raising an
 +    exception if the line to handle is not an ssh public key.
 +  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP). [zobel]
 +
 + -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 14:27:50 +0200
  
  userdir-ldap (0.3.25) unstable; urgency=low
  

diff --cc ud-generate
Simple merge