*** empty log message ***

diff --git a/changelog b/changelog
index 592dc5d0dce81e91bbdc5d346f21449a32c72c51..1a41c6b2c6202f6f13bca506c77da46f894885d7 100644 (file)
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ userv-utils (0.2.99.0.2) unstable; urgency=low
   * groupmanage: configurable group name length limit.
     (Thanks to small patch from Ben Harris.)
   * add HTTP_REFERER to ucgi.
+  * Allow config file to override ipif default clock skew and lag.
+  * Set default max clock skew to 45/45, not 10/30.
 
  --
 

diff --git a/debian/changelog b/debian/changelog
index 592dc5d0dce81e91bbdc5d346f21449a32c72c51..1a41c6b2c6202f6f13bca506c77da46f894885d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ userv-utils (0.2.99.0.2) unstable; urgency=low
   * groupmanage: configurable group name length limit.
     (Thanks to small patch from Ben Harris.)
   * add HTTP_REFERER to ucgi.
+  * Allow config file to override ipif default clock skew and lag.
+  * Set default max clock skew to 45/45, not 10/30.
 
  --
 

diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index 7dffe3f36493dd74293263f4a390fac69be96b79..fffbbe74f6c66c77b6485d2400058ecc93cc66be 100644 (file)
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -20,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`])