diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-19 19:32:55 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-19 19:32:55 +0000 |
| commit | a1284b1dc0edb9df01bb78070c6cc172383aa4f2 (patch) | |
| tree | 129805116cfb1915290b29a701da1d678cc5e469 /sbin/isakmpd/init.c | |
| parent | 608e69f177c007956605ba38af06aff9ccf9d266 (diff) | |
cert.c: Merge with EOM 1.14
ike_auth.c: Merge with EOM 1.43
ike_phase_1.c: Merge with EOM 1.21
init.c: Merge with EOM 1.24
ipsec.c: Merge with EOM 1.117
isakmpd.c: Merge with EOM 1.44
math_group.c: Merge with EOM 1.22
author: niklas
Copyright 2000
author: niklas
Allow isakmpd builders to remove optional parts and save bytes.
Diffstat (limited to 'sbin/isakmpd/init.c')
| -rw-r--r-- | sbin/isakmpd/init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/isakmpd/init.c b/sbin/isakmpd/init.c index 2deeba43d36..1697b73d3e4 100644 --- a/sbin/isakmpd/init.c +++ b/sbin/isakmpd/init.c @@ -1,8 +1,8 @@ -/* $OpenBSD: init.c,v 1.13 2000/02/01 02:46:18 niklas Exp $ */ -/* $EOM: init.c,v 1.22 2000/01/31 22:33:46 niklas Exp $ */ +/* $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 $ */ /* - * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. * Copyright (c) 2000 Angelos D. Keromytis. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,7 +57,7 @@ #include "udp.h" #include "ui.h" -#if defined (USE_KEYNOTE) || defined (HAVE_DLOPEN) +#ifdef USE_POLICY #include "policy.h" #endif @@ -81,7 +81,7 @@ init () connection_init (); cookie_init (); -#if defined (USE_KEYNOTE) || defined (HAVE_DLOPEN) +#ifdef USE_POLICY /* policy_init depends on conf_init having run. */ policy_init (); #endif |