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 @@
-/* $OpenBSD: channels.c,v 1.295 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.296 2009/05/25 06:48:00 andreas Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * 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)
                         }
                         return -1;
                 }
+#ifndef BROKEN_TCGETATTR_ICANON
                 if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') {
                         if (tcgetattr(c->wfd, &tio) == 0 &&
                             !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) {
@@ -1666,6 +1667,7 @@ channel_handle_wfd(Channel *c, fd_set *readset, fd_set *writeset)
                                 packet_send();
                         }
                 }
+#endif
                 buffer_consume(&c->output, len);
                 if (compat20 && len > 0) {
                         c->local_consumed += len;
@@ -2431,7 +2433,7 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
         int id;
 
         /* Reset keepalive timeout */
-        keep_alive_timeouts = 0;
+        packet_set_alive_timeouts(0);
 
         id = packet_get_int();
         packet_check_eom();