From d577a83a31e9938ca46fe15ef0bfb2b09722832a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 1 Feb 2008 21:53:32 +0000 Subject: * Backport from upstream: - Use the correct packet maximum sizes for remote port and agent forwarding. Prevents the server from killing the connection if too much data is queued and an excessively large packet gets sent (https://bugzilla.mindrot.org/show_bug.cgi?id=1360). --- clientloop.c | 4 ++-- debian/changelog | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/clientloop.c b/clientloop.c index aa8697900..7037c4192 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1726,7 +1726,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) } c = channel_new("forwarded-tcpip", SSH_CHANNEL_CONNECTING, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, + CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, originator_address, 1); xfree(originator_address); xfree(listen_address); @@ -1784,7 +1784,7 @@ client_request_agent(const char *request_type, int rchan) return NULL; c = channel_new("authentication agent connection", SSH_CHANNEL_OPEN, sock, sock, -1, - CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, + CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "authentication agent connection", 1); c->force_drain = 1; return c; diff --git a/debian/changelog b/debian/changelog index ac0e40932..d2c6dea57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ openssh (1:4.7p1-3) UNRELEASED; urgency=low * Improve grammar of ssh-askpass-gnome description. + * Backport from upstream: + - Use the correct packet maximum sizes for remote port and agent + forwarding. Prevents the server from killing the connection if too + much data is queued and an excessively large packet gets sent + (https://bugzilla.mindrot.org/show_bug.cgi?id=1360). -- Colin Watson Sat, 12 Jan 2008 09:11:08 +0000 -- cgit v1.2.3