summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-10-07 06:59:25 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-10-07 06:59:25 +0000
commit4c43aa90b2d474d5a84cd2a0faf065b8539ff6ba (patch)
treefa0251a3cc8ee2c033e19024e61ba0eea46d7e3f
parent8e2cfa67b1633672a2bb8d9403617c57ccf1ca21 (diff)
Merge with EOM 1.42
author: ho ipsec_decode_ids is only used with USE_DEBUG
-rw-r--r--sbin/isakmpd/isakmp_doi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/isakmpd/isakmp_doi.c b/sbin/isakmpd/isakmp_doi.c
index e3de955b0cf..42d788be710 100644
--- a/sbin/isakmpd/isakmp_doi.c
+++ b/sbin/isakmpd/isakmp_doi.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: isakmp_doi.c,v 1.10 2000/08/03 07:23:00 niklas Exp $ */
-/* $EOM: isakmp_doi.c,v 1.41 2000/07/02 18:47:16 provos Exp $ */
+/* $OpenBSD: isakmp_doi.c,v 1.11 2000/10/07 06:59:24 niklas Exp $ */
+/* $EOM: isakmp_doi.c,v 1.42 2000/09/12 16:29:41 ho Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -105,7 +105,9 @@ static struct doi isakmp_doi = {
isakmp_validate_transform_id,
isakmp_initiator,
isakmp_responder,
+#ifdef USE_DEBUG
ipsec_decode_ids
+#endif
};
/* Requires doi_init to already have been called. */