summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-04-07 22:05:09 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-04-07 22:05:09 +0000
commitd3e8831b55aff529d61c72807dac07eb468fe8fb (patch)
tree15336542e9f16d7292c6dcc840509e75bcacbf66
parent30eb4be6362590d47eae6dfcef28c9ef60451137 (diff)
init.c: Merge with EOM 1.25
log.h: Merge with EOM 1.19 author: ho Add log_init().
-rw-r--r--sbin/isakmpd/init.c6
-rw-r--r--sbin/isakmpd/log.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/sbin/isakmpd/init.c b/sbin/isakmpd/init.c
index 1697b73d3e4..0da9ab65484 100644
--- a/sbin/isakmpd/init.c
+++ b/sbin/isakmpd/init.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: init.c,v 1.14 2000/02/19 19:32:53 niklas Exp $ */
-/* $EOM: init.c,v 1.24 2000/02/19 07:58:55 niklas Exp $ */
+/* $OpenBSD: init.c,v 1.15 2000/04/07 22:05:08 niklas Exp $ */
+/* $EOM: init.c,v 1.25 2000/03/30 14:27:24 ho Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -50,6 +50,7 @@
#include "ipsec.h"
#include "isakmp_doi.h"
#include "libcrypto.h"
+#include "log.h"
#include "math_group.h"
#include "sa.h"
#include "timer.h"
@@ -64,6 +65,7 @@
void
init ()
{
+ log_init ();
app_init ();
doi_init ();
exchange_init ();
diff --git a/sbin/isakmpd/log.h b/sbin/isakmpd/log.h
index eea40ad1b87..b8ea6ec5fe8 100644
--- a/sbin/isakmpd/log.h
+++ b/sbin/isakmpd/log.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: log.h,v 1.7 2000/02/25 17:23:41 niklas Exp $ */
-/* $EOM: log.h,v 1.18 2000/02/20 19:58:40 niklas Exp $ */
+/* $OpenBSD: log.h,v 1.8 2000/04/07 22:05:08 niklas Exp $ */
+/* $EOM: log.h,v 1.19 2000/03/30 14:27:23 ho Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -81,5 +81,6 @@ extern void log_error (const char *, ...);
extern void log_fatal (const char *, ...);
extern void log_print (const char *, ...);
extern void log_to (FILE *);
+extern void log_init (void);
#endif /* _LOG_H_ */