summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--channels.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 60ea75fd4..f5e287dc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
120060103 120060103
2 - (djm) [channels.c] clean up harmless merge error, from reyk@
3
420060103
2 - (djm) OpenBSD CVS Sync 5 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2006/01/02 17:09:49 6 - jmc@cvs.openbsd.org 2006/01/02 17:09:49
4 [ssh_config.5 sshd_config.5] 7 [ssh_config.5 sshd_config.5]
@@ -3628,4 +3631,4 @@
3628 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3631 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3629 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3632 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3630 3633
3631$Id: ChangeLog,v 1.4072 2006/01/03 07:47:31 djm Exp $ 3634$Id: ChangeLog,v 1.4073 2006/01/03 20:27:50 djm Exp $
diff --git a/channels.c b/channels.c
index ed5903f6f..5fa80fbad 100644
--- a/channels.c
+++ b/channels.c
@@ -1491,8 +1491,6 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
1491 } 1491 }
1492 return 1; 1492 return 1;
1493 } 1493 }
1494 data = buffer_ptr(&c->output);
1495 dlen = buffer_len(&c->output);
1496#ifdef _AIX 1494#ifdef _AIX
1497 /* XXX: Later AIX versions can't push as much data to tty */ 1495 /* XXX: Later AIX versions can't push as much data to tty */
1498 if (compat20 && c->wfd_isatty) 1496 if (compat20 && c->wfd_isatty)