View | Details | Raw Unified | Return to bug 2044
Collapse All | Expand All

(-)clientloop.c.orig (-1 / +1 lines)
Lines 2033-2039 Link Here
2033
		packet_put_int((u_int)ws.ws_ypixel);
2033
		packet_put_int((u_int)ws.ws_ypixel);
2034
		if (tiop == NULL)
2034
		if (tiop == NULL)
2035
			tiop = get_saved_tio();
2035
			tiop = get_saved_tio();
2036
		tty_make_modes(-1, tiop);
2036
		tty_make_modes(-1, tiop, 0);
2037
		packet_send();
2037
		packet_send();
2038
		/* XXX wait for reply */
2038
		/* XXX wait for reply */
2039
		c->client_tty = 1;
2039
		c->client_tty = 1;
(-)packet.h.orig (-1 / +1 lines)
Lines 89-95 Link Here
89
void	 packet_send_ignore(int);
89
void	 packet_send_ignore(int);
90
void	 packet_add_padding(u_char);
90
void	 packet_add_padding(u_char);
91
91
92
void	 tty_make_modes(int, struct termios *);
92
void	 tty_make_modes(int, struct termios *, int);
93
void	 tty_parse_modes(int, int *);
93
void	 tty_parse_modes(int, int *);
94
94
95
void	 packet_set_alive_timeouts(int);
95
void	 packet_set_alive_timeouts(int);
(-)ssh.c.orig (-1 / +1 lines)
Lines 1163-1169 Link Here
1163
		packet_put_int((u_int)ws.ws_ypixel);
1163
		packet_put_int((u_int)ws.ws_ypixel);
1164
1164
1165
		/* Store tty modes in the packet. */
1165
		/* Store tty modes in the packet. */
1166
		tty_make_modes(fileno(stdin), NULL);
1166
		tty_make_modes(fileno(stdin), NULL, options.request_tty == REQUEST_TTY_FORCE);
1167
1167
1168
		/* Send the packet, and wait for it to leave. */
1168
		/* Send the packet, and wait for it to leave. */
1169
		packet_send();
1169
		packet_send();
(-)ttymodes.c.orig (-2 / +3 lines)
Lines 250-256 Link Here
250
 * being constructed.
250
 * being constructed.
251
 */
251
 */
252
void
252
void
253
tty_make_modes(int fd, struct termios *tiop)
253
tty_make_modes(int fd, struct termios *tiop, int quiet)
254
{
254
{
255
	struct termios tio;
255
	struct termios tio;
256
	int baud;
256
	int baud;
Lines 275-281 Link Here
275
			goto end;
275
			goto end;
276
		}
276
		}
277
		if (tcgetattr(fd, &tio) == -1) {
277
		if (tcgetattr(fd, &tio) == -1) {
278
			logit("tcgetattr: %.100s", strerror(errno));
278
			if (!quiet)
279
				logit("tcgetattr: %.100s", strerror(errno));
279
			goto end;
280
			goto end;
280
		}
281
		}
281
	} else
282
	} else

Return to bug 2044