summaryrefslogtreecommitdiff
path: root/dispatch.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-01-30 01:13:33 +0000
committerDamien Miller <djm@mindrot.org>2015-01-30 12:18:59 +1100
commit4509b5d4a4fa645a022635bfa7e86d09b285001f (patch)
treecb94ac37e4d5c59a3a5c2cde3b6c76363e7035d3 /dispatch.c
parent669aee994348468af8b4b2ebd29b602cf2860b22 (diff)
upstream commit
avoid more fatal/exit in the packet.c paths that ssh-keyscan uses; feedback and "looks good" markus@
Diffstat (limited to 'dispatch.c')
-rw-r--r--dispatch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/dispatch.c b/dispatch.c
index 9ff5e3daf..900a2c10c 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dispatch.c,v 1.24 2015/01/28 22:05:31 djm Exp $ */ 1/* $OpenBSD: dispatch.c,v 1.25 2015/01/30 01:13:33 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -49,9 +49,9 @@ dispatch_protocol_error(int type, u_int32_t seq, void *ctx)
49 fatal("protocol error"); 49 fatal("protocol error");
50 if ((r = sshpkt_start(ssh, SSH2_MSG_UNIMPLEMENTED)) != 0 || 50 if ((r = sshpkt_start(ssh, SSH2_MSG_UNIMPLEMENTED)) != 0 ||
51 (r = sshpkt_put_u32(ssh, seq)) != 0 || 51 (r = sshpkt_put_u32(ssh, seq)) != 0 ||
52 (r = sshpkt_send(ssh)) != 0) 52 (r = sshpkt_send(ssh)) != 0 ||
53 fatal("%s: %s", __func__, ssh_err(r)); 53 (r = ssh_packet_write_wait(ssh)) != 0)
54 ssh_packet_write_wait(ssh); 54 sshpkt_fatal(ssh, __func__, r);
55 return 0; 55 return 0;
56} 56}
57 57