diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-03-08 08:43:05 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-03-08 08:43:05 +0000 |
| commit | faba539f5e9d0dd730869eb6fc9d2170dd10df30 (patch) | |
| tree | da5326eff4224ef8b9bb2be416c9e51362d411e2 /sbin/isakmpd | |
| parent | 1d1e9e39c4203e7ca07e25b76edad6efd85f4817 (diff) | |
Merge with EOM 1.24
author: niklas
line break
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/ike_phase_1.c | 7 |
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; } |