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

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

(limited to 'files/handlers')

diff --git a/files/handlers/rsync b/files/handlers/rsync
index ab0b2ed..44f9e7f 100644
--- a/files/handlers/rsync
+++ b/files/handlers/rsync
@@ -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