@@ -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.
   * 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 a0b9c0ca1b93a57cf690f9a8a0e668a6ab9efc34..fc79b64cb4188231e868c175601217da83bd3790 100644 (file)
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -14,7 +14,7 @@ m4_dnl You should have received a copy of the GNU General Public License
 m4_dnl along with userv-utils; if not, write to the Free Software
 m4_dnl Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 m4_dnl
 m4_dnl along with userv-utils; if not, write to the Free Software
 m4_dnl Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 m4_dnl

-m4_dnl $Id: udptunnel-vpn-defaults,v 1.4 2001/03/10 17:32:29 ian Exp $
+m4_dnl $Id: udptunnel-vpn-defaults,v 1.5 2001/09/26 00:20:35 ian Exp $

 
 SET(   lcommand,       [udptunnel])
 SET( crypto,
 
 SET(   lcommand,       [udptunnel])
 SET( crypto,


@@ -49,7 +49,8 @@ SET( ssh,
        [ssh    V_sshstdopts \
                V_sshprotoka V_sshverbose \
                V_sshopts])
        [ssh    V_sshstdopts \
                V_sshprotoka V_sshverbose \
                V_sshopts])

-
+SET( sshinvoke,                [V_ssh V_ruser@V_sshdest]_)
+               

 SET(   sshdest,        [V_rpublic])
 
 SET(   sites,          [sites])
 SET(   sshdest,        [V_rpublic])
 
 SET(   sites,          [sites])


@@ -104,7 +105,5 @@ SET(        command,
        V_timeouts \
        V_rnets \
        V_lnets \
        V_timeouts \
        V_rnets \
        V_lnets \

-       V_ssh \
-               V_ruser@V_sshdest \
-               V_rcommand
+       V_sshinvoke V_rcommand

        ])
        ])