Attachment 1677 Details for Bug 1528 – Skip tcgetattr on solaris

[patch] Skip tcgetattr on solaris

openssh-solaris-tcgetattr.patch (text/plain), 1.41 KB, created by Darren Tucker on 2009-08-28 10:38:14 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2009-08-28 10:38:14 AEST

Size: 1.41 KB

patch

obsolete

>Index: channels.c
>===================================================================
>RCS file: /var/cvs/openssh/channels.c,v
>retrieving revision 1.284
>diff -u -p -r1.284 channels.c
>--- channels.c	21 Jun 2009 08:12:20 -0000	1.284
>+++ channels.c	28 Aug 2009 00:36:41 -0000
>@@ -1654,6 +1654,7 @@ channel_handle_wfd(Channel *c, fd_set *r
> 			return -1;
> 		}
> 		if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') {
>+#ifndef BROKEN_TCGETATTR_ICANON
> 			if (tcgetattr(c->wfd, &tio) == 0 &&
> 			    !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) {
> 				/*
>@@ -1665,6 +1666,7 @@ channel_handle_wfd(Channel *c, fd_set *r
> 				packet_send_ignore(4 + len);
> 				packet_send();
> 			}
>+#endif
> 		}
> 		buffer_consume(&c->output, len);
> 		if (compat20 && len > 0) {
>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.422
>diff -u -p -r1.422 configure.ac
>--- configure.ac	16 Aug 2009 23:35:22 -0000	1.422
>+++ configure.ac	28 Aug 2009 00:36:42 -0000
>@@ -671,6 +671,7 @@ mips-sony-bsd|mips-sony-newsos4)
> 		after setsid()])
> 	AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd
> 		in case the name is longer than 8 chars])
>+	AC_DEFINE(BROKEN_TCGETATTR_ICANON, tcgetattr with ICANON may hang)
> 	external_path_file=/etc/default/login
> 	# hardwire lastlog location (can't detect it on some versions)
> 	conf_lastlog_location="/var/adm/lastlog"

Actions: View | Diff

Attachments on bug 1528: 1570 | 1571 | 1572 | 1677