X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=f8a8b99b1fe7afabf6951c1176b8afdc63b9c4a7;hp=6887fe3429aa6b6c55e44f65803ddc205020300c;hb=14979f835df4214a7c2510852f7ffedc9e08c2c0;hpb=7496ecc45ab6205bcce4e576c23b9afb52004e39

diff --git a/src/net_setup.c b/src/net_setup.c
index 6887fe34..f8a8b99b 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_setup.c,v 1.1.2.7 2002/03/01 13:18:54 guus Exp $
+    $Id: net_setup.c,v 1.1.2.8 2002/03/01 14:09:31 guus Exp $
 */
 
 #include "config.h"
@@ -328,6 +328,9 @@ cp
 
   get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
 
+  if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
+    macexpire= 600;
+
   if(get_config_int(lookup_config(myself->connection->config_tree, "MaxTimeout"), &maxtimeout))
     {
       if(maxtimeout <= 0)
@@ -392,7 +395,7 @@ cp
   if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
     keylifetime = 3600;
 
-  keyexpires = time(NULL) + keylifetime;
+  keyexpires = now + keylifetime;
 
   /* Check if we want to use message authentication codes... */
 
@@ -514,6 +517,8 @@ cp
 int setup_network_connections(void)
 {
 cp
+  now = time(NULL);
+
   init_connections();
   init_subnets();
   init_nodes();