X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=site.c;h=567b85f85d26d97947f11d1447f2330822ff14c4;hb=b567d7576f09da81916f0b2781f2772259fe9d79;hp=8a2d69ae5b5f713b28ab8099dea4c07b47e9657e;hpb=16f73fa6cc7426276bc4bd0cc8537d08c64cbc83;p=secnet.git

diff --git a/site.c b/site.c
index 8a2d69a..567b85f 100644
--- a/site.c
+++ b/site.c
@@ -1238,18 +1238,19 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
 
     st->key_lifetime=dict_read_number(
 	dict,"key-lifetime",False,"site",loc,DEFAULT_KEY_LIFETIME);
-    if (st->key_lifetime < DEFAULT_KEY_RENEGOTIATE_GAP)
-	st->key_renegotiate_time=st->key_lifetime/2;
-    else
-	st->key_renegotiate_time=st->key_lifetime-DEFAULT_KEY_RENEGOTIATE_GAP;
     st->setup_retries=dict_read_number(
 	dict,"setup-retries",False,"site",loc,DEFAULT_SETUP_RETRIES);
     st->setup_timeout=dict_read_number(
 	dict,"setup-timeout",False,"site",loc,DEFAULT_SETUP_TIMEOUT);
     st->wait_timeout=dict_read_number(
 	dict,"wait-time",False,"site",loc,DEFAULT_WAIT_TIME);
+
+    if (st->key_lifetime < DEFAULT_KEY_RENEGOTIATE_GAP*2)
+	st->key_renegotiate_time=st->key_lifetime/2;
+    else
+	st->key_renegotiate_time=st->key_lifetime-DEFAULT_KEY_RENEGOTIATE_GAP;
     st->key_renegotiate_time=dict_read_number(
-	dict,"renegotiate-time",False,"site",loc,st->key_lifetime);
+	dict,"renegotiate-time",False,"site",loc,st->key_renegotiate_time);
     if (st->key_renegotiate_time > st->key_lifetime) {
 	cfgfatal(loc,"site",
 		 "renegotiate-time must be less than key-lifetime\n");