summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2003-03-06 13:32:43 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2003-03-06 13:32:43 +0000
commita8b0bcddbef6618d39d958e9be15fa2840135328 (patch)
treeed97ea50969febad3177fbb679dbd3def8289e10 /sbin
parentded1ec0e57ba4e11a0dd959b0062467ec2664efc (diff)
Bad cut'n'paste msg plus style fixes.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/exchange.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c
index ef5d2c4884a..cdbccc597c6 100644
--- a/sbin/isakmpd/exchange.c
+++ b/sbin/isakmpd/exchange.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exchange.c,v 1.77 2003/02/26 08:17:59 david Exp $ */
+/* $OpenBSD: exchange.c,v 1.78 2003/03/06 13:32:42 ho Exp $ */
/* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */
/*
@@ -786,7 +786,7 @@ exchange_establish_p1 (struct transport *t, u_int8_t type, u_int32_t doi,
type = constant_value (isakmp_exch_cst, str);
if (!type)
{
- log_print ("exchange_establish_p1: unknown exchange type %s",
+ log_print ("exchange_setup_p1: unknown exchange type %s",
str);
return;
}
@@ -1833,14 +1833,10 @@ exchange_establish (char *name,
* finalization routine; otherwise, call it directly.
*/
if (exchange)
- {
- exchange_add_finalization (exchange, finalize, arg);
- }
+ exchange_add_finalization (exchange, finalize, arg);
else
- {
- finalize (0, arg, 1); /* Indicate failure */
- }
- return;
+ finalize (0, arg, 1); /* Indicate failure */
+ return;
}
else
exchange_establish_p2 (isakmp_sa, 0, name, 0, finalize, arg);