From 7ef6a0b844d26e75188ea3609f79b3affafc9083 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 17 Aug 2010 10:59:13 -0300
Subject: Fixing ssh_cmd and RSYNC_RSH at rsync handler

---
 handlers/rsync.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'handlers')

diff --git a/handlers/rsync.in b/handlers/rsync.in
index 8f638d7..be97773 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -279,7 +279,7 @@ function eval_config {
     nice=""
   fi
 
-  ssh_cmd="ssh -T -o PasswordAuthentication=no $host -p $port -l $user -i $id_file"
+  ssh_cmd="ssh -T -o PasswordAuthentication=no -o Hostname=$host -p $port -l $user -i $id_file"
 
   if [ "$from" == "remote" ] || [ "$dest" == "remote" ]; then
     if [ "$testconnect" == "yes" ] && [ "$protocol" == "ssh" ]; then
@@ -913,7 +913,7 @@ function set_rsync_options {
       else
         debug RSYNC_RSH=\"$ssh_cmd\"
         echo RSYNC_RSH=\"$ssh_cmd\" >> $log
-        RSYNC_RSH="$ssh_cmd"
+        export RSYNC_RSH="$ssh_cmd"
       fi
     fi
 
-- 
cgit v1.2.3