summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-08-26 22:31:46 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-08-26 22:31:46 +0000
commitef61be074ed7519271bafa8a70c428e7d02f7b9c (patch)
tree33f103dbd600cd2ebb9f165eb7d57ded0fac8fc9 /sbin
parent5b8d732ad24fa28b7607d1051c698c7b863ae2a1 (diff)
Merge with EOM 1.37
author: niklas Support dynamic loading of libkeynote too. Build isakmpd static by default. Stylistic cleanup of keynote policy code. Correct some libcrypto calls.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/isakmpd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index 3adb13327be..c3d0c5c12e5 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: isakmpd.c,v 1.13 1999/08/05 22:40:57 niklas Exp $ */
-/* $EOM: isakmpd.c,v 1.36 1999/08/05 15:01:20 niklas Exp $ */
+/* $OpenBSD: isakmpd.c,v 1.14 1999/08/26 22:31:45 niklas Exp $ */
+/* $EOM: isakmpd.c,v 1.37 1999/08/26 11:21:49 niklas Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -55,7 +55,7 @@
#include "ui.h"
#include "util.h"
-#ifdef USE_KEYNOTE
+#if defined (USE_KEYNOTE) || defined (HAVE_DLOPEN)
#include "policy.h"
#endif
@@ -169,7 +169,7 @@ reinit (void)
/* Reread config file. */
conf_reinit ();
-#ifdef USE_KEYNOTE
+#if defined (USE_KEYNOTE) || defined (HAVE_DLOPEN)
/* Reread the policies. */
policy_init ();
#endif