From 18f6031a726c4e2e96049c8ca4f1fc3b5dcc7c00 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 12 Dec 2007 02:54:09 +0000
Subject: [PATCH] rdiff: incorporate sshoptions into options via remote-schema
if not there
---
ChangeLog | 2 ++
handlers/rdiff.in | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 42fc43c..0c7e6fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ version 0.9.6 -- unreleased
handler changes
rdiff:
. Fixed ignore_version default value missing
+ . Add patch from Matthew Palmer to rdiff handler to incorporate sshoptions
+ into options via remote-schema not already specified (Closes: #424639)
wget:
. New handler from rhatto designed to incrementally pull content from
a website to a local folder, based on the rsync handler
diff --git a/handlers/rdiff.in b/handlers/rdiff.in
index bb704c5..0f93429 100644
--- a/handlers/rdiff.in
+++ b/handlers/rdiff.in
@@ -101,6 +101,10 @@ getconf host; desthost=$host
getconf sshoptions
check_consistency "destination" "$type" "$user" "$host"
+if [ -n "$sshoptions" ] && echo $options | grep -qv "remote-schema"; then
+ options="$options --remote-schema 'ssh -C $sshoptions %s rdiff-backup --server'"
+fi
+
### CHECK CONFIG ###
# If vservers are configured, check that the ones listed in $vsnames do exist.
--
GitLab