- djm@cvs.openbsd.org 2008/05/19 15:45:07

     [sshtty.c ttymodes.c sshpty.h]
     Fix sending tty modes when stdin is not a tty (bz#1199). Previously
     we would send the modes corresponding to a zeroed struct termios,
     whereas we should have been sending an empty list of modes.
     Based on patch from daniel.ritz AT alcatel.ch; ok dtucker@ markus@

1 files changed, 5 insertions, 5 deletions

diff --git a/ttymodes.c b/ttymodes.c
index d8e2c553a..d11d00c28 100644
--- a/ttymodes.c
+++ b/ttymodes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttymodes.c,v 1.26 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: ttymodes.c,v 1.27 2008/05/19 15:45:07 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -298,6 +298,10 @@ tty_make_modes(int fd, struct termios *tiop)
         }
 
         if (tiop == NULL) {
+                if (fd == -1) {
+                        debug("tty_make_modes: no fd or tio");
+                        goto end;
+                }
                 if (tcgetattr(fd, &tio) == -1) {
                         logit("tcgetattr: %.100s", strerror(errno));
                         goto end;
@@ -317,12 +321,10 @@ tty_make_modes(int fd, struct termios *tiop)
 
         /* Store values of mode flags. */
 #define TTYCHAR(NAME, OP) \
-        debug3("tty_make_modes: %d %d", OP, tio.c_cc[NAME]); \
         buffer_put_char(&buf, OP); \
         put_arg(&buf, special_char_encode(tio.c_cc[NAME]));
 
 #define TTYMODE(NAME, FIELD, OP) \
-        debug3("tty_make_modes: %d %d", OP, ((tio.FIELD & NAME) != 0)); \
         buffer_put_char(&buf, OP); \
         put_arg(&buf, ((tio.FIELD & NAME) != 0));
 
@@ -410,7 +412,6 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
         case OP: \
           n_bytes += arg_size; \
           tio.c_cc[NAME] = special_char_decode(get_arg()); \
-          debug3("tty_parse_modes: %d %d", OP, tio.c_cc[NAME]); \
           break;
 #define TTYMODE(NAME, FIELD, OP) \
         case OP: \
@@ -419,7 +420,6 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
             tio.FIELD |= NAME; \
           else \
             tio.FIELD &= ~NAME; \
-          debug3("tty_parse_modes: %d %d", OP, arg); \
           break;
 
 #include "ttymodes.h"