summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c
index 584afb76a..3bc8bb8d0 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.193 2008/05/09 16:21:13 markus Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.194 2008/05/19 20:53:52 djm 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
@@ -1725,7 +1725,6 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
1725 1725
1726 if (want_tty) { 1726 if (want_tty) {
1727 struct winsize ws; 1727 struct winsize ws;
1728 struct termios tio;
1729 1728
1730 /* Store window size in the packet. */ 1729 /* Store window size in the packet. */
1731 if (ioctl(in_fd, TIOCGWINSZ, &ws) < 0) 1730 if (ioctl(in_fd, TIOCGWINSZ, &ws) < 0)
@@ -1738,8 +1737,9 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
1738 packet_put_int((u_int)ws.ws_row); 1737 packet_put_int((u_int)ws.ws_row);
1739 packet_put_int((u_int)ws.ws_xpixel); 1738 packet_put_int((u_int)ws.ws_xpixel);
1740 packet_put_int((u_int)ws.ws_ypixel); 1739 packet_put_int((u_int)ws.ws_ypixel);
1741 tio = get_saved_tio(); 1740 if (tiop == NULL)
1742 tty_make_modes(-1, tiop != NULL ? tiop : &tio); 1741 tiop = get_saved_tio();
1742 tty_make_modes(-1, tiop);
1743 packet_send(); 1743 packet_send();
1744 /* XXX wait for reply */ 1744 /* XXX wait for reply */
1745 c->client_tty = 1; 1745 c->client_tty = 1;