Changes to make it appear to work on chiark

[userv-utils.git] / ipif / udptunnel-vpn-defaults

diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index f6117ac4ced2716874c6893efa5777de8f39d179..520359e1bfa62e23dcb3ae723be5ee60e4b8a2cd 100644 (file)
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -1,5 +1,8 @@
 m4_dnl udptunnel-vpn-defaults: default settings for udptunnel-reconf
 
+m4_dnl Copyright (C) 1999-2000,2003 Ian Jackson
+m4_dnl This file is part of ipif, part of userv-utils
+
 m4_dnl This is free software; you can redistribute it and/or modify it
 m4_dnl under the terms of the GNU General Public License as published by
 m4_dnl the Free Software Foundation; either version 2 of the License, or
@@ -17,8 +20,9 @@ m4_dnl
 m4_dnl $Id$
 
 SET(   lcommand,       [udptunnel])
+SET(   clock_maxskew,  45)
 SET( crypto,
-       [-e nonce -e timestamp/10/30 -e pkcs5/8 \
+       [-e nonce -e timestamp/V_clock_maxskew/V_clock_maxskew -e pkcs5/8 \
        -e blowfish-cbcmac/128 -e blowfish-cbc/128])
 
 SET(   lpublic,        [`hostname`])
@@ -28,7 +32,7 @@ SET(  rport,          [Command])
 m4_dnl lend            -- usually set in global
 m4_dnl rend            -- usually set in sites
 SET(   mtu,            [1000])
-SET(   proto,          [cslip])
+SET(   proto,          [slip])
 SET(   to_restart,     [10])
 SET(   to_poll,        [30])
 SET(   to_quit,        [130])
@@ -49,7 +53,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 +109,5 @@ SET(        command,
        V_timeouts \
        V_rnets \
        V_lnets \
-       V_ssh \
-               V_ruser@V_sshdest \
-               V_rcommand
+       V_sshinvoke V_rcommand
        ])