diff options
author | Damien Miller <djm@mindrot.org> | 2006-01-04 07:27:50 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-01-04 07:27:50 +1100 |
commit | a969437645550a8f7595ba017c7658c4341d77d1 (patch) | |
tree | 0e4dbb41d6d60114019bf4bc08b8d8803ffcc097 | |
parent | b797770da28c07a10b51528f79af3bacae2ff613 (diff) |
- (djm) [channels.c] clean up harmless merge error, from reyk@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,7 @@ 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 [ssh_config.5 sshd_config.5] @@ -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 $ @@ -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) |