diff options
author | 1999-08-26 22:31:45 +0000 | |
---|---|---|
committer | 1999-08-26 22:31:45 +0000 | |
commit | 64befca902b524e8f1aebadfad4f63db2856772f (patch) | |
tree | b7b687eba4a3b7134fdf00f5e1941a3d31d74a98 | |
parent | Merge with EOM 1.25 (diff) | |
download | wireguard-openbsd-64befca902b524e8f1aebadfad4f63db2856772f.tar.xz wireguard-openbsd-64befca902b524e8f1aebadfad4f63db2856772f.zip |
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.
-rw-r--r-- | sbin/isakmpd/isakmpd.c | 8 |
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 |