Parcourir la source

Fix v-add-backup-host for sftp servers with different login prompt (#2950)

* Fix v-add-backup-host for sftp server that outputs different password prompt

On FreeBSD hosted sftp server, the password prompt looks something like this: "Password for: user@host:". This case was not handled so far.

* Fix sftp backup procedure for servers with different login prompt
Darko Gjorgjijoski il y a 3 ans
Parent
commit
88dc8f02e7
2 fichiers modifiés avec 10 ajouts et 0 suppressions
  1. 5 0
      bin/v-add-backup-host
  2. 5 0
      func/backup.sh

+ 5 - 0
bin/v-add-backup-host

@@ -60,6 +60,11 @@ sftpc() {
                 exp_continue
             }
 
+            -re "Password for (.*)@(.*)" {
+                send "$password\r"
+                exp_continue
+            }
+
             -re "Couldn't|(.*)disconnect|(.*)stalled|(.*)not found" {
                 set count \$argc
                 set output "Disconnected."

+ 5 - 0
func/backup.sh

@@ -208,6 +208,11 @@ sftpc() {
                     send "$PASSWORD\r"
                     exp_continue
                 }
+
+                -re "Password for (.*)@(.*)" {
+                    send "$PASSWORD\r"
+                    exp_continue
+                }
     
                 -re "Couldn't|(.*)disconnect|(.*)stalled|(.*)not found" {
                     set count \$argc