diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:20:30 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:20:30 +0000 |
| commit | 150eebdd42697a8259e7673ad4807291b4db7aee (patch) | |
| tree | e7923027986750634fd989cfc875128397c71231 /sbin/isakmpd | |
| parent | d316ad8d1928b9dd66d713bab9c412d4948c65ec (diff) | |
Merge with EOM 1.113
author: ho
Lower common log message from log_print to log_debug 'level'.
author: niklas
style & wording
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/exchange.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index 64846e4a432..5230e5c2221 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,5 +1,5 @@ -/* $OpenBSD: exchange.c,v 1.24 1999/08/26 22:32:16 niklas Exp $ */ -/* $EOM: exchange.c,v 1.111 1999/08/20 11:57:29 niklas Exp $ */ +/* $OpenBSD: exchange.c,v 1.25 2000/01/26 15:20:29 niklas Exp $ */ +/* $EOM: exchange.c,v 1.113 1999/11/28 17:46:28 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -53,6 +53,7 @@ #include "exchange.h" #include "ipsec_num.h" #include "isakmp.h" +#include "libcrypto.h" #include "log.h" #include "message.h" #include "timer.h" @@ -340,7 +341,8 @@ exchange_run (struct message *msg) if ((payload->flags & PL_MARK) == 0) if (!doi->handle_leftover_payload || doi->handle_leftover_payload (msg, i, payload)) - log_print ("exchange_run: unexpected payload %s", + log_debug (LOG_EXCHANGE, 10, + "exchange_run: unexpected payload %s", constant_name (isakmp_payload_cst, i)); /* @@ -1327,14 +1329,16 @@ exchange_finalize (struct message *msg) case ISAKMP_CERTENC_NONE: msg->isakmp_sa->recv_cert = strdup (exchange->recv_cert); if (msg->isakmp_sa->recv_cert == NULL) - log_fatal ("exchange_finalize: failed copying shared secret to isakmp_sa"); + log_fatal ("exchange_finalize: strdup (\"%s\") failed", + exchange->recv_cert); break; case ISAKMP_CERTENC_X509_SIG: msg->isakmp_sa->recv_cert = LC (X509_dup, ((X509 *) exchange->recv_cert)); if (msg->isakmp_sa->recv_cert == NULL) - log_fatal ("exchange_finalize: failed copying X509 certificate to isakmp_sa"); + log_fatal ("exchange_finalize: " + "failed copying X509 certificate to isakmp_sa"); break; /* XXX Eventually handle these */ |