2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f583bc7ef..b32b72157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,11 @@
      ServerAlive and ClientAlive timers.  Prevents dropping a connection
      when these are enabled but the peer does not support our keepalives.
      bz #1307, ok djm@.
+   - 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@.
 
 20071202
  - (dtucker) [configure.ac] Enable -fstack-protector-all on systems where
@@ -3477,4 +3482,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4809 2007/12/28 15:45:07 dtucker Exp $
+$Id: ChangeLog,v 1.4810 2007/12/28 22:37:10 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index 38ff614a9..109df4cac 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.184 2007/12/28 15:32:24 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.185 2007/12/28 22:34:47 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1745,7 +1745,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);
@@ -1803,7 +1803,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;