@@ -6,6 +6,7 @@

+  * indirect ssh via V_sshinvoke.

diff --git a/changelog b/changelog
index d2bbbd2f72992abfd3347c21b6327a5bfcbd056f..9830a0235d998d5a71f7b8282e7ec380ab71e82d 100644 (file)
--- 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 d2bbbd2f72992abfd3347c21b6327a5bfcbd056f..9830a0235d998d5a71f7b8282e7ec380ab71e82d 100644 (file)
--- 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 f6117ac4ced2716874c6893efa5777de8f39d179..d3c087370aab8dc54af32ca54417beb5021115fd 100644 (file)
--- 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
        ])