tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [channels.c] clean up harmless merge error, from reyk@

This commit is contained in:
Damien Miller 2006-01-04 07:27:50 +11:00
parent b797770da2
commit a969437645
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20060103
- (djm) [channels.c] clean up harmless merge error, from reyk@
20060103
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2006/01/02 17:09:49
@ -3628,4 +3631,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4072 2006/01/03 07:47:31 djm Exp $
$Id: ChangeLog,v 1.4073 2006/01/03 20:27:50 djm Exp $

2
channels.c
View File

@ -1491,8 +1491,6 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
}
return 1;
}
data = buffer_ptr(&c->output);
dlen = buffer_len(&c->output);
#ifdef _AIX
/* XXX: Later AIX versions can't push as much data to tty */
if (compat20 && c->wfd_isatty)