diff options
author | Christoph Gysin | 2017-09-26 21:22:24 +0300 |
---|---|---|
committer | Christoph Gysin | 2017-09-26 21:22:24 +0300 |
commit | e21f22ff5b23d4f99cf2878fbb07b001a1ac4dc9 (patch) | |
tree | 066105f5d236abb89998e82fd0c5ef144f656b1b | |
parent | fa70f374aba8b0963b229dc80b2f9fb4cb723752 (diff) | |
download | aur-e21f22ff5b23d4f99cf2878fbb07b001a1ac4dc9.tar.gz |
remove unused patches
-rw-r--r-- | dispatch.patch | 81 | ||||
-rw-r--r-- | error.patch | 25 |
2 files changed, 0 insertions, 106 deletions
diff --git a/dispatch.patch b/dispatch.patch deleted file mode 100644 index 9350d8ff6efd..000000000000 --- a/dispatch.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 639d6bc57b1942393ed12fb48f00bc05d4e093e4 Mon Sep 17 00:00:00 2001 -From: djm@openbsd.org <djm@openbsd.org> -Date: Fri, 01 May 2015 07:10:01 +0000 -Subject: upstream commit - -refactor ssh_dispatch_run_fatal() to use sshpkt_fatal() - to better report error conditions. Teach sshpkt_fatal() about ECONNRESET. - -Improves error messages on TCP connection resets. bz#2257 - -ok dtucker@ ---- -diff --git a/dispatch.c b/dispatch.c -index afe6182..aac933e 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); - } -diff --git a/packet.c b/packet.c -index 4922573..a7727ef 100644 ---- a/packet.c -+++ b/packet.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: packet.c,v 1.208 2015/02/13 18:57:00 markus Exp $ */ -+/* $OpenBSD: packet.c,v 1.212 2015/05/01 07:10:01 djm Exp $ */ - /* - * Author: Tatu Ylonen <ylo@cs.hut.fi> - * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland -@@ -1920,9 +1920,19 @@ sshpkt_fatal(struct ssh *ssh, const char *tag, int r) - 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 write", ssh_remote_ipaddr(ssh)); -+ logit("Connection to %.200s timed out", ssh_remote_ipaddr(ssh)); - cleanup_exit(255); -+ case SSH_ERR_DISCONNECTED: -+ logit("Disconnected from %.200s", -+ ssh_remote_ipaddr(ssh)); -+ cleanup_exit(255); -+ case SSH_ERR_SYSTEM_ERROR: -+ if (errno == ECONNRESET) { -+ logit("Connection reset by %.200s", -+ ssh_remote_ipaddr(ssh)); -+ cleanup_exit(255); -+ } -+ /* FALLTHROUGH */ - default: - fatal("%s%sConnection to %.200s: %s", - tag != NULL ? tag : "", tag != NULL ? ": " : "", --- -cgit v0.9.2 diff --git a/error.patch b/error.patch deleted file mode 100644 index 1616ba3630ef..000000000000 --- a/error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4d24b3b6a4a6383e05e7da26d183b79fa8663697 Mon Sep 17 00:00:00 2001 -From: Damien Miller <djm@mindrot.org> -Date: Thu, 19 Mar 2015 22:11:59 +0000 -Subject: remove error() accidentally inserted for debugging - -pointed out by Christian Hesse ---- -diff --git a/monitor_wrap.c b/monitor_wrap.c -index b379f05..d39d491 100644 ---- a/monitor_wrap.c -+++ b/monitor_wrap.c -@@ -153,10 +153,8 @@ mm_request_receive(int sock, Buffer *m) - debug3("%s entering", __func__); - - if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) { -- if (errno == EPIPE) { -- error("%s: socket closed", __func__); -+ if (errno == EPIPE) - cleanup_exit(255); -- } - fatal("%s: read: %s", __func__, strerror(errno)); - } - msg_len = get_u32(buf); --- -cgit v0.9.2 |