From 7edeb110b6cd0e349d95de2cb463c2de6b339622 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 10 Oct 2013 12:57:16 +0300
Subject: [PATCH] workaround for talky ftp

---
 bin/v-add-backup-ftp-host | 7 ++++---
 bin/v-backup-user         | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/v-add-backup-ftp-host b/bin/v-add-backup-ftp-host
index 374b443d..01530ffd 100755
--- a/bin/v-add-backup-ftp-host
+++ b/bin/v-add-backup-ftp-host
@@ -23,7 +23,7 @@ source $VESTA/conf/vesta.conf
 
 # Defining ftp command function
 ftpc() {
-    /usr/bin/ftp -n $host $ftp_port <<EOF
+    ftp -n $host $ftp_port <<EOF
     quote USER $ftp_user
     quote PASS $ftp_password
     binary
@@ -48,7 +48,8 @@ validate_format 'host' 'ftp_user' 'ftp_password'
 #----------------------------------------------------------#
 
 # Checking network connection
-if [ ! -z "$(ftpc)" ]; then
+ftp_connect=$(ftpc)
+if [ ! -z "$(echo $ftp_connect |grep -i -e error -e 'not connected')" ]; then
     echo "Error: can't login to ftp"
     log_event "$E_CONNECT" "$EVENT"
     exit $E_CONNECT
@@ -60,7 +61,7 @@ ftmpdir=$(mktemp -u -p "$ftp_path")
 ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir")
 if [ ! -z "$ftp_result" ] ; then
     rm -rf $tmpdir
-    echo "Error: can't create temp folder on the ftp"
+    #echo "Error: can't create temp folder on the ftp"
     log_event "$E_FTP" "$EVENT"
     exit $E_FTP
 fi
diff --git a/bin/v-backup-user b/bin/v-backup-user
index 96a2e9fb..7b8a71d8 100755
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@@ -556,7 +556,8 @@ ftp_backup() {
     echo -e "$(date "+%F %T") FTP ftp://$HOST$BPATH/$user.$DATE.tar"
 
     # Checking ftp connection
-    if [ ! -z "$(ftpc)" ]; then
+    ftp_connect=$(ftpc)
+    if [ ! -z "$(echo $ftp_connect |grep -i -e error -e 'not conn')" ]; then
         rm -rf $tmpdir
         echo "Can't login to ftp://$USERNAME@$HOST" |\
             $send_mail -s "$subj" $email