Merge pull request #5 from elonhub/add-sftp

Bug 584 - Allow sftp as copy and commit-archive location destination

2 files changed, 7 insertions, 5 deletions

diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl
index dc9ad6e..517b7ff 100755
--- a/scripts/vyatta-load-config.pl
+++ b/scripts/vyatta-load-config.pl
@@ -78,7 +78,8 @@ if ( $load_file =~ /^[^\/]\w+:\// ) {
         unless( $proto eq 'tftp' ||
 		$proto eq 'ftp'  ||
 		$proto eq 'http' ||
-		$proto eq 'scp' ) {
+		$proto eq 'scp'  ||
+		$proto eq 'sftp' ) {
 	    die "Invalid url protocol [$proto]\n";
         }
     } else {
@@ -127,8 +128,8 @@ elsif ( $mode eq 'url' ) {
         }
     }
     my $rc = system("curl -# -o $url_tmp_file $load_file");
-    if ($proto eq 'scp' && ($rc >> 8) == 51){
-        $load_file =~ m/scp:\/\/(.*?)\//;
+    if ($proto =~ /^(scp|sftp)$/ && ($rc >> 8) == 51){
+        $load_file =~ m/(?:scp|sftp):\/\/(.*?)\//;
         my $host = $1;
         if ($host =~ m/.*@(.*)/) {
           $host = $1;
diff --git a/scripts/vyatta-save-config.pl b/scripts/vyatta-save-config.pl
index 96dd4b1..0799dd4 100755
--- a/scripts/vyatta-save-config.pl
+++ b/scripts/vyatta-save-config.pl
@@ -60,6 +60,7 @@ if ($save_file =~ /^[^\/]\w+:\//) {
         if ($proto eq 'tftp') {
         } elsif ($proto eq 'ftp') {
         } elsif ($proto eq 'scp') {
+        } elsif ($proto eq 'sftp') {
         } else {
             print "Invalid url protocol [$proto]\n";
             exit 1;
@@ -123,8 +124,8 @@ close $save;
 if ($mode eq 'url') {
 
     my $rc = 0;
-    if ($proto eq 'scp'){
-        $save_file =~ m/scp:\/\/(.*?)\//;
+    if ($proto =~ /^(scp|sftp)$/){
+        $save_file =~ m/(?:scp|sftp):\/\/(.*?)\//;
         my $host = $1;
         my $user = getpwuid($<);
         if ($host =~ m/(.*)@(.*)/) {