summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniklas <niklas@openbsd.org>2000-03-08 08:43:04 +0000
committerniklas <niklas@openbsd.org>2000-03-08 08:43:04 +0000
commit73329ee5645d8d8f80ef78212ca3264ce7ff6c6f (patch)
tree1e6777b9ffce8f9819d3aeed545f380803d9662f
parentcert.c: Merge with EOM 1.15 (diff)
downloadwireguard-openbsd-73329ee5645d8d8f80ef78212ca3264ce7ff6c6f.tar.xz
wireguard-openbsd-73329ee5645d8d8f80ef78212ca3264ce7ff6c6f.zip
Merge with EOM 1.24
author: niklas line break
-rw-r--r--sbin/isakmpd/ike_phase_1.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/isakmpd/ike_phase_1.c b/sbin/isakmpd/ike_phase_1.c
index b38d296e2c9..718fb62bfcb 100644
--- a/sbin/isakmpd/ike_phase_1.c
+++ b/sbin/isakmpd/ike_phase_1.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: ike_phase_1.c,v 1.16 2000/02/28 22:48:34 niklas Exp $ */
-/* $EOM: ike_phase_1.c,v 1.23 2000/02/28 22:52:46 niklas Exp $ */
+/* $OpenBSD: ike_phase_1.c,v 1.17 2000/03/08 08:43:04 niklas Exp $ */
+/* $EOM: ike_phase_1.c,v 1.24 2000/03/07 20:40:24 niklas Exp $ */
/*
* Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -1161,7 +1161,8 @@ attribute_unacceptable (u_int16_t type, u_int8_t *value, u_int16_t len,
if (!life_conf)
{
/* Life attributes given, but not in our policy. */
- log_print ("attribute_unacceptable: received unexpected life attribute");
+ log_print ("attribute_unacceptable: "
+ "received unexpected life attribute");
return 1;
}