diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-11 10:22:26 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-11 10:22:26 +0000 |
| commit | ad38462a286ba1b772234afe19ba30ad5dbee3fa (patch) | |
| tree | fa95e7269a7db5c4380f305775a070e1fc6816f8 /sbin | |
| parent | 7ec46190172696ed43c8b1a36b43bd4c528e8fbe (diff) | |
Merge with EOM 1.19
author: ho
style...
author: ho
Think-o. Reword log msg again to match what happens here.
author: ho
(struct constant_map *) is not (char *), plus reword the log msg.
Diffstat (limited to 'sbin')
| -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 9a9397de5ff..04018f331a6 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.12 2000/02/01 02:46:18 niklas Exp $ */ -/* $EOM: ike_phase_1.c,v 1.16 2000/01/31 22:33:45 niklas Exp $ */ +/* $OpenBSD: ike_phase_1.c,v 1.13 2000/02/11 10:22:25 niklas Exp $ */ +/* $EOM: ike_phase_1.c,v 1.19 2000/02/07 02:08:13 ho Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -1128,7 +1128,8 @@ attribute_unacceptable (u_int16_t type, u_int8_t *value, u_int16_t len, LIST_INSERT_HEAD (&vs->attrs, node, link); return 0; } - log_print ("attribute_unacceptable: got %s, expected %s", map, str); + log_print ("attribute_unacceptable: %s: got %s, expected %s", + tag, constant_lookup (map, decode_16 (value)), str); return 1; case IKE_ATTR_GROUP_PRIME: |