2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b3518803..1d9d7412c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20031122
+ - (dtucker) [channels.c] Make AIX write limit code clearer.  Suggested by djm@
+
 20031121
  - (djm) OpenBSD CVS Sync
    - markus@cvs.openbsd.org 2003/11/20 11:39:28
@@ -1498,4 +1501,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3119 2003/11/21 12:48:55 djm Exp $
+$Id: ChangeLog,v 1.3120 2003/11/22 03:10:02 dtucker Exp $
diff --git a/channels.c b/channels.c
index 25f85c8b7..5a2605f91 100644
--- a/channels.c
+++ b/channels.c
@@ -1398,8 +1398,8 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
                 dlen = buffer_len(&c->output);
 #ifdef _AIX
                 /* XXX: Later AIX versions can't push as much data to tty */
-                if (compat20 && c->wfd_isatty && dlen > 8*1024)
-                        dlen = 8*1024;
+                if (compat20 && c->wfd_isatty)
+                        dlen = MIN(dlen, 8*1024);
 #endif
                 len = write(c->wfd, data, dlen);
                 if (len < 0 && (errno == EINTR || errno == EAGAIN))