diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-04-02 18:43:25 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-04-02 18:43:25 +0000 |
| commit | a636f8f94f5560996eb6bfdf71d55e54c347f861 (patch) | |
| tree | 664162295f90561ff86495d45687547921fdf8be /crypto/openssh | |
| parent | 97599fcfd9bf65862279665f41dfac0cd5e4aadf (diff) | |
| download | FreeBSD-src-a636f8f94f5560996eb6bfdf71d55e54c347f861.zip FreeBSD-src-a636f8f94f5560996eb6bfdf71d55e54c347f861.tar.gz | |
Use proper CHAN_TCP_PACKET_DEFAULT for agent forwarding when HPN disabled.
The use of CHAN_TCP_WINDOW_DEFAULT here was fixed in upstream OpenSSH
in CVS 1.4810, git 5baa170d771de9e95cf30b4c469ece684244cf3e:
- dtucker@cvs.openbsd.org 2007/12/28 22:34:47
[clientloop.c]
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. bz #1360, ok djm@.
The change was lost due to the the way the original upstream HPN patch
modified this code. It was re-adding the original OpenSSH code and never
was properly fixed to use the new value.
MFC after: 2 weeks
Diffstat (limited to 'crypto/openssh')
| -rw-r--r-- | crypto/openssh/clientloop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/clientloop.c b/crypto/openssh/clientloop.c index 0532f1e..01bed9f 100644 --- a/crypto/openssh/clientloop.c +++ b/crypto/openssh/clientloop.c @@ -1923,7 +1923,7 @@ client_request_agent(const char *request_type, int rchan) if (options.hpn_disabled) 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); else c = channel_new("authentication agent connection", |
