summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-05-14 20:09:51 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-05-14 20:09:51 +0000
commit125cf88b3813490d3a44f733f751dc71a2ce4f19 (patch)
tree8b52313d618a9aa4ace8299d642d96950e1380d7
parent36dd840cc90f4f3945c89ce58602ae052f123f47 (diff)
Merge with EOM 1.92
author: ho seconds should have initial value
-rw-r--r--sbin/isakmpd/sa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index 6cbbca9d3e9..168c6f436c4 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: sa.c,v 1.19 1999/05/06 22:44:42 niklas Exp $ */
-/* $EOM: sa.c,v 1.91 1999/05/06 21:43:12 niklas Exp $ */
+/* $OpenBSD: sa.c,v 1.20 1999/05/14 20:09:50 niklas Exp $ */
+/* $EOM: sa.c,v 1.92 1999/05/09 20:26:17 ho Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -665,7 +665,7 @@ sa_mark_replaced (struct sa *sa)
int
sa_setup_expirations (struct sa *sa)
{
- u_int64_t seconds;
+ u_int64_t seconds = sa->seconds;
struct timeval expiration;
/*