diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-07-02 13:18:50 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-07-02 13:18:50 +0000 |
| commit | b5a1b3a82df411cb95b6a850e9d9d90bc3d082f9 (patch) | |
| tree | 2fc0f8c0c9b94a14bd7ce42838fc88997f4cd7b8 /dispatch.c | |
| parent | c1e0861503468de5ae00ed0e532f349ec78bec68 (diff) | |
Vendor import of OpenSSH 6.9p1.vendor/openssh/6.9p1
Notes
svn path=/vendor-crypto/openssh/dist/; revision=285033
svn path=/vendor-crypto/openssh/6.9p1/; revision=285034; tag=vendor/openssh/6.9p1
Diffstat (limited to 'dispatch.c')
| -rw-r--r-- | dispatch.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/dispatch.c b/dispatch.c index afe618221a6a..aac933e0a501 100644 --- a/dispatch.c +++ b/dispatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.26 2015/02/12 20:34:19 dtucker Exp $ */ +/* $OpenBSD: dispatch.c,v 1.27 2015/05/01 07:10:01 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -137,22 +137,6 @@ ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done, { int r; - if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) { - switch (r) { - case SSH_ERR_CONN_CLOSED: - logit("Connection closed by %.200s", - ssh_remote_ipaddr(ssh)); - cleanup_exit(255); - case SSH_ERR_CONN_TIMEOUT: - logit("Connection to %.200s timed out while " - "waiting to read", ssh_remote_ipaddr(ssh)); - cleanup_exit(255); - case SSH_ERR_DISCONNECTED: - logit("Disconnected from %.200s", - ssh_remote_ipaddr(ssh)); - cleanup_exit(255); - default: - fatal("%s: %s", __func__, ssh_err(r)); - } - } + if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) + sshpkt_fatal(ssh, __func__, r); } |