summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-07-13 15:46:33 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-07-13 15:46:33 +0000
commitd8aa7318ab0674625bbe7f85c1fa11d55dced829 (patch)
tree99b0715d4ad893ffdf2c8a08b326752ebedfa697 /sbin
parentd0e661be14492b0bc5cc1cd3252e0a4302c8a350 (diff)
Merge with EOM 1.17
author: ho Oops.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/connection.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/isakmpd/connection.c b/sbin/isakmpd/connection.c
index 414e0774edb..4b746bf0280 100644
--- a/sbin/isakmpd/connection.c
+++ b/sbin/isakmpd/connection.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: connection.c,v 1.3 1999/07/07 22:04:34 niklas Exp $ */
-/* $EOM: connection.c,v 1.16 1999/06/07 00:10:47 ho Exp $ */
+/* $OpenBSD: connection.c,v 1.4 1999/07/13 15:46:32 niklas Exp $ */
+/* $EOM: connection.c,v 1.17 1999/07/11 13:09:54 ho Exp $ */
/*
* Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
@@ -451,9 +451,9 @@ connection_report (void)
gettimeofday (&now, 0);
for (conn = TAILQ_FIRST (&connections); conn; conn = TAILQ_NEXT (conn, link))
log_debug (LOG_REPORT, 0,
- "connection_report: connection %s next check %ld seconds",
+ "connection_report: connection %s next check %d seconds",
(conn->name ? conn->name : "<unnamed>"),
- (long)conn->ev - now.tv_sec);
+ conn->ev->expiration.tv_sec - now.tv_sec);
for (pconn = TAILQ_FIRST (&connections_passive); pconn;
pconn = TAILQ_NEXT (pconn, link))
log_debug (LOG_REPORT, 0,