- djm@cvs.openbsd.org 2008/05/19 20:53:52

     [clientloop.c]
     unbreak tree by committing this bit that I missed from:
     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@

diff --git a/ChangeLog b/ChangeLog
index b35aec7c1be76b12daf9b0c4909c4662175dbbbf..43f845efff1baa0e41dfcb43c08d98292c354a6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,13 @@
      support -l (print fingerprint) in combination with -F (find host) to
      search for a host in ~/.ssh/known_hosts and display its fingerprint;
      ok markus@
+   - djm@cvs.openbsd.org 2008/05/19 20:53:52
+     [clientloop.c]
+     unbreak tree by committing this bit that I missed from:
+     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@ 
 
 20080604
  - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias

diff --git a/clientloop.c b/clientloop.c
index 584afb76ae5cd048830ffdd3e20dae2c676e0a39..3bc8bb8d05b5240364a4789af8e1b11f63f85d63 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.193 2008/05/09 16:21:13 markus Exp $ */
+/* $OpenBSD: clientloop.c,v 1.194 2008/05/19 20:53:52 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1725,7 +1725,6 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
 
        if (want_tty) {
                struct winsize ws;
-               struct termios tio;
 
                /* Store window size in the packet. */
                if (ioctl(in_fd, TIOCGWINSZ, &ws) < 0)
@@ -1738,8 +1737,9 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
                packet_put_int((u_int)ws.ws_row);
                packet_put_int((u_int)ws.ws_xpixel);
                packet_put_int((u_int)ws.ws_ypixel);
-               tio = get_saved_tio();
-               tty_make_modes(-1, tiop != NULL ? tiop : &tio);
+               if (tiop == NULL)
+                       tiop = get_saved_tio();
+               tty_make_modes(-1, tiop);
                packet_send();
                /* XXX wait for reply */
                c->client_tty = 1;