diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
commit | 59247ecde39f2d826a94ab07f6095ca1f6644e88 (patch) | |
tree | 5910d4a840352aafbf67e8a39fa63936e5529b26 /channels.c | |
parent | 07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (diff) | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) |
* New upstream release.
* Update to GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels.c b/channels.c index f0b8aa7d0..94065a443 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.295 2009/02/12 03:00:56 djm Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.296 2009/05/25 06:48:00 andreas Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1653,6 +1653,7 @@ channel_handle_wfd(Channel *c, fd_set *readset, fd_set *writeset) | |||
1653 | } | 1653 | } |
1654 | return -1; | 1654 | return -1; |
1655 | } | 1655 | } |
1656 | #ifndef BROKEN_TCGETATTR_ICANON | ||
1656 | if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') { | 1657 | if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') { |
1657 | if (tcgetattr(c->wfd, &tio) == 0 && | 1658 | if (tcgetattr(c->wfd, &tio) == 0 && |
1658 | !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) { | 1659 | !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) { |
@@ -1666,6 +1667,7 @@ channel_handle_wfd(Channel *c, fd_set *readset, fd_set *writeset) | |||
1666 | packet_send(); | 1667 | packet_send(); |
1667 | } | 1668 | } |
1668 | } | 1669 | } |
1670 | #endif | ||
1669 | buffer_consume(&c->output, len); | 1671 | buffer_consume(&c->output, len); |
1670 | if (compat20 && len > 0) { | 1672 | if (compat20 && len > 0) { |
1671 | c->local_consumed += len; | 1673 | c->local_consumed += len; |
@@ -2431,7 +2433,7 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt) | |||
2431 | int id; | 2433 | int id; |
2432 | 2434 | ||
2433 | /* Reset keepalive timeout */ | 2435 | /* Reset keepalive timeout */ |
2434 | keep_alive_timeouts = 0; | 2436 | packet_set_alive_timeouts(0); |
2435 | 2437 | ||
2436 | id = packet_get_int(); | 2438 | id = packet_get_int(); |
2437 | packet_check_eom(); | 2439 | packet_check_eom(); |