summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-02-28 22:48:35 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-02-28 22:48:35 +0000
commitdf01ea5a2b9c75b12a941d21d8a34a8f219b0699 (patch)
treebb73491080fae3ceed883e8dc808e092f244d61f /sbin
parentcf11bfb68fec1928e0e0bbb9b21351ae7db422da (diff)
Merge with EOM 1.23
author: niklas nm@wizard.web.am & winquist@cybernet.com both independently found my bug, a %s without a string given.
Diffstat (limited to 'sbin')
-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 ac0da71df83..b38d296e2c9 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.15 2000/02/25 17:23:40 niklas Exp $ */
-/* $EOM: ike_phase_1.c,v 1.22 2000/02/20 19:58:38 niklas Exp $ */
+/* $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 $ */
/*
* Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -241,7 +241,8 @@ ike_phase_1_initiator_send_SA (struct message *msg)
exchange->doi->is_attribute_incompatible, msg))
{
log_error ("ike_phase_1_initiator_send_SA: "
- "section [%s] has unsupported attribute(s)");
+ "section [%s] has unsupported attribute(s)",
+ xf->field);
goto bail_out;
}
}