From: ian <ian>
Date: Sun, 5 Sep 2004 16:10:30 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: debian_version_0_3~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=ed33cd7d8223a3f9e9ff5b126775a0dbef499800

*** empty log message ***
---

diff --git a/changelog b/changelog
index 592dc5d..1a41c6b 100644
--- 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 592dc5d..1a41c6b 100644
--- 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 7dffe3f..fffbbe7 100644
--- 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`])