Attachment 2190 Details for Bug 2044 – patch with a fix

[patch] patch with a fix

diff-tty-sshv1-OpenSSH-v6.1.patch (text/plain), 1.59 KB, created by Ivo Raisr on 2012-09-26 21:35:14 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivo Raisr

Created: 2012-09-26 21:35:14 AEST

Size: 1.59 KB

patch

obsolete

>--- clientloop.c.orig	2012-09-26 10:25:58.371944029 +0200
>+++ clientloop.c	2012-09-26 10:26:09.923944304 +0200
>@@ -2033,7 +2033,7 @@
> 		packet_put_int((u_int)ws.ws_ypixel);
> 		if (tiop == NULL)
> 			tiop = get_saved_tio();
>-		tty_make_modes(-1, tiop);
>+		tty_make_modes(-1, tiop, 0);
> 		packet_send();
> 		/* XXX wait for reply */
> 		c->client_tty = 1;
>--- packet.h.orig	2012-09-26 08:45:11.255800310 +0200
>+++ packet.h	2012-09-26 08:45:46.051801137 +0200
>@@ -89,7 +89,7 @@
> void	 packet_send_ignore(int);
> void	 packet_add_padding(u_char);
> 
>-void	 tty_make_modes(int, struct termios *);
>+void	 tty_make_modes(int, struct termios *, int);
> void	 tty_parse_modes(int, int *);
> 
> void	 packet_set_alive_timeouts(int);
>--- ssh.c.orig	2012-09-26 08:45:18.891800489 +0200
>+++ ssh.c	2012-09-26 10:25:48.595943796 +0200
>@@ -1163,7 +1163,7 @@
> 		packet_put_int((u_int)ws.ws_ypixel);
> 
> 		/* Store tty modes in the packet. */
>-		tty_make_modes(fileno(stdin), NULL);
>+		tty_make_modes(fileno(stdin), NULL, options.request_tty == REQUEST_TTY_FORCE);
> 
> 		/* Send the packet, and wait for it to leave. */
> 		packet_send();
>--- ttymodes.c.orig	2012-09-26 08:45:27.211800690 +0200
>+++ ttymodes.c	2012-09-26 10:26:59.967945494 +0200
>@@ -250,7 +250,7 @@
>  * being constructed.
>  */
> void
>-tty_make_modes(int fd, struct termios *tiop)
>+tty_make_modes(int fd, struct termios *tiop, int quiet)
> {
> 	struct termios tio;
> 	int baud;
>@@ -275,7 +275,8 @@
> 			goto end;
> 		}
> 		if (tcgetattr(fd, &tio) == -1) {
>-			logit("tcgetattr: %.100s", strerror(errno));
>+			if (!quiet)
>+				logit("tcgetattr: %.100s", strerror(errno));
> 			goto end;
> 		}
> 	} else

Actions: View | Diff

Attachments on bug 2044: 2190