summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/ipsec.h
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-04-08 16:52:42 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-04-08 16:52:42 +0000
commit22d65b03fd03870051fa54e1ec227c3f1d509e11 (patch)
treefa6c0c06726642c7213616b281d2502c0314ce50 /sbin/isakmpd/ipsec.h
parent642f324b1c9f95a661777461d2ecc3a3b564bb92 (diff)
always enable aggressive, dpd, and isakmp_cfg
Diffstat (limited to 'sbin/isakmpd/ipsec.h')
-rw-r--r--sbin/isakmpd/ipsec.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/sbin/isakmpd/ipsec.h b/sbin/isakmpd/ipsec.h
index 1b3c9963c1f..0dc74dee49f 100644
--- a/sbin/isakmpd/ipsec.h
+++ b/sbin/isakmpd/ipsec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec.h,v 1.24 2004/05/23 18:17:56 hshoexer Exp $ */
+/* $OpenBSD: ipsec.h,v 1.25 2005/04/08 16:52:41 deraadt Exp $ */
/* $EOM: ipsec.h,v 1.42 2000/12/03 07:58:20 angelos Exp $ */
/*
@@ -39,9 +39,7 @@
#include <netinet/in.h>
#include "ipsec_doi.h"
-#ifdef USE_ISAKMP_CFG
#include "isakmp_cfg.h"
-#endif
struct group;
struct hash;
@@ -99,12 +97,10 @@ struct ipsec_exch {
u_int8_t *id_cr;
size_t id_cr_sz;
-#ifdef USE_ISAKMP_CFG
/* ISAKMP configuration mode parameters */
u_int16_t cfg_id;
u_int16_t cfg_type;
LIST_HEAD(isakmp_cfg_attr_head, isakmp_cfg_attr) attrs;
-#endif
};
#define IPSEC_EXCH_FLAG_NO_ID 1