From: Julien Cristau <jcristau@debian.org>
Date: Wed, 18 Nov 2015 15:02:33 +0000 (+0100)
Subject: Pass BatchMode=yes option to ssh
X-Git-Tag: userdir-ldap-0.3.88~16
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=606067cc38aa39ca0acbb7169f5e9cf87c351e1b;hp=8d3d618363b534a0471dcaf161b1cc3afa77b4d7

Pass BatchMode=yes option to ssh

Should help fail quickly in case of network issues.  Remove the
PreferredAuthentications setting which becomes redundant.

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/ud-replicate b/ud-replicate
index db384e3..869d65a 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -74,7 +74,7 @@ if [ -e /var/lib/misc/thishost/dns-zone ]; then
   cp /var/lib/misc/thishost/dns-zone $tempfile2
 fi
 
-rsync ${verbose} --delete-after --times -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
+rsync ${verbose} --delete-after --times -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]