From: ian <ian>
Date: Wed, 26 Sep 2001 00:20:35 +0000 (+0000)
Subject: @@ -6,6 +6,7 @@
X-Git-Tag: rel-uservutils-0-2-2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=56a03854554a5b3da8e3faa1d4237dc83b8128a3

@@ -6,6 +6,7 @@
+  * indirect ssh via V_sshinvoke.
---

diff --git a/changelog b/changelog
index d2bbbd2..9830a02 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,7 @@ userv-utils (0.2.2) unstable; urgency=low
   * forbid_remote is a per-tunnel option.
   * udptunnel-vpn-config.m4 allows global file to override as intended.
   * www-cgi passes HTTP_COOKIE header.
+  * indirect ssh via V_sshinvoke.
 
  --
 
diff --git a/debian/changelog b/debian/changelog
index d2bbbd2..9830a02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ userv-utils (0.2.2) unstable; urgency=low
   * forbid_remote is a per-tunnel option.
   * udptunnel-vpn-config.m4 allows global file to override as intended.
   * www-cgi passes HTTP_COOKIE header.
+  * indirect ssh via V_sshinvoke.
 
  --
 
diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index f6117ac..d3c0873 100644
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -49,7 +49,8 @@ SET( ssh,
 	[ssh	V_sshstdopts \
 		V_sshprotoka V_sshverbose \
 		V_sshopts])
-
+SET( sshinvoke,		[V_ssh V_ruser@V_sshdest]_)
+		
 SET(	sshdest,	[V_rpublic])
 
 SET(	sites,		[sites])
@@ -104,7 +105,5 @@ SET(	command,
 	V_timeouts \
 	V_rnets \
 	V_lnets \
-	V_ssh \
-		V_ruser@V_sshdest \
-		V_rcommand
+	V_sshinvoke V_rcommand
 	])