From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 14 May 2008 15:32:49 +0000 (+0200)
Subject: Add VoIP fiels to the LDAP shema and teach ud-info and ud-mailgate about it. [zobel]
X-Git-Tag: userdir-ldap-0.3.22~3
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=bb945fb1a5ba9ddeee3fc90a477cfc49e9b53ce5;hp=26042a727441733429ecc39dd3792158f2a2ba86

Add VoIP fiels to the LDAP shema and teach ud-info and ud-mailgate about it. [zobel]
---

diff --git a/debian/changelog b/debian/changelog
index 8716d70..38afa81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+userdir-ldap (0.3.21+X) Xunstable; urgency=low
+
+  * Add VoIP fiels to the LDAP shema and teach ud-info and ud-mailgate
+    about it. [zobel]
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 14 May 2008 17:31:22 +0200
+
+userdir-ldap (0.3.21) unstable; urgency=low
+
+  * ud-replicate: use the host key to sync stuff from the db server,
+    that is, call ssh with ii /etc/ssh/ssh_host_rsa_key.
+  * ud-replicate: Call ssh with -o PreferredAuthentications=publickey
+    so that it does not even try password authentication.
+
+ -- Peter Palfrader <weasel@debian.org>  Tue, 13 May 2008 22:06:23 +0200
+
 userdir-ldap (0.3.20) unstable; urgency=low
 
   * Teach ud-mailgate about ipv6 addresses (RT#193).
diff --git a/ud-replicate b/ud-replicate
index e0f8fe7..655b263 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -49,7 +49,7 @@ $LOCALSYNCON)
     ;;
 esac
 
-rsync ${verbose} -e ssh -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
+rsync ${verbose} -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]