Merge sshkeys branch from Stephen and Mark

diff --cc debian/changelog
index 120e41b,bcf0142..ffc9300
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,18 @@@
- userdir-ldap (0.3.24) UNRELEASED; urgency=low
+ userdir-ldap (0.3.23+common1) unstable; urgency=low
  
-  -- Andreas Barth <aba@not.so.argh.org>  Fri, 16 May 2008 17:35:19 +0000
++  [ Andreas Barth ]
 +  * Add compatibility to dchroot-dsa to ud-replicate.
 +  * Add (disabled) generation of authorized_keys suiteable for sshdist.
 +  * Add performance optimization by caching IP adresses in ud-generate
 +    (as a precondition for automatically adding aliases)
 +
+   [ Stephen Gran ]
+   * ud-replicate: handle individual ssh keys
+ 
+   [ Mark Hymers ]
+   * ud-generate: handle individual ssh keys
+ 
+  -- Mark Hymers <mhy@debian.org>  Wed, 14 May 2008 22:09:22 +0100
  
  userdir-ldap (0.3.23) unstable; urgency=low
  

diff --cc ud-generate
index 7d6399c,8a4588c..b48cdc3
--- 1/ud-generate
--- 2/ud-generate
+++ b/ud-generate
@@@ -7,7 -7,7 +7,8 @@@
  #   Copyright (c) 2004-2005,7  Joey Schulze <joey@infodrom.org>
  #   Copyright (c) 2001-2007  Ryan Murray <rmurray@debian.org>
  #   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
 +#   Copyright (c) 2008 Andreas Barth <aba@not.so.argh.org>
+ #   Copyright (c) 2008 Mark Hymers <mhy@debian.org>
  #
  #   This program is free software; you can redistribute it and/or modify
  #   it under the terms of the GNU General Public License as published by

diff --cc ud-replicate
index d7137cd,8bbef7c..d1c0b24
--- 1/ud-replicate
--- 2/ud-replicate
+++ b/ud-replicate
@@@ -68,13 -77,19 +77,24 @@@ don
  ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
  ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
  
+ if [ -e ${HOST}/ssh-keys.tar.gz ]; then
+   export TMPDIR='/tmp/' 
+   tempdir=$(mktemp -d)
+   old=$(pwd -P)
+   cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz
+   cd $old
+   mkdir userkeys 2> /dev/null || true
+   chmod 755 $tempdir
+   rsync -a --delete-after $tempdir/ userkeys/
+ fi
+ 
  if [ -x /usr/bin/dchroot ]; then
        CHROOTS=`dchroot --listpaths`
 +fi
 +if [ -x /usr/bin/dchroot-dsa ]; then
 +        CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
 +fi
 +if [ -n "$CHROOTS" ]; then
        for c in $CHROOTS; do
                if [ -x "$c/usr/bin/makedb" ]
                then