- markus@cvs.openbsd.org 2002/04/01 22:02:16

     [sftp-client.c]
     20480 is an upper limit for older server

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index cf42f3650..1159bc563 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
    - markus@cvs.openbsd.org 2002/03/30 18:51:15
      [monitor.c serverloop.c sftp-int.c sftp.c sshd.c]
      check waitpid for EINTR; based on patch from peter@ifm.liu.se
+   - markus@cvs.openbsd.org 2002/04/01 22:02:16
+     [sftp-client.c]
+     20480 is an upper limit for older server
 
 20020401
  - (stevesk) [monitor.c] PAM should work again; will *not* work with
@@ -8130,4 +8133,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2014 2002/04/02 20:53:39 mouring Exp $
+$Id: ChangeLog,v 1.2015 2002/04/02 20:58:11 mouring Exp $
diff --git a/sftp-client.c b/sftp-client.c
index ce82b6af5..98ed2ba00 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -28,7 +28,7 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.28 2002/03/19 10:49:35 markus Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.29 2002/04/01 22:02:16 markus Exp $");
 
 #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>
@@ -274,7 +274,7 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests)
 
         /* Some filexfer v.0 servers don't support large packets */
         if (version == 0)
-                ret->transfer_buflen = MAX(ret->transfer_buflen, 20480);
+                ret->transfer_buflen = MIN(ret->transfer_buflen, 20480);
 
         return(ret);
 }