diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-08-28 11:02:37 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-08-28 11:02:37 +1000 |
commit | 3980b636312516ee823e84e884dadbc86e6795d3 (patch) | |
tree | 9831ee718e444151d57aae8f045db8e4ff04ce76 /configure.ac | |
parent | 7d4a2685f78440f09d25bf3fc7236a5f99af208a (diff) |
- (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on
the pty master on Solaris, since it never succeeds and can hang if large
amounts of data is sent to the slave (eg a copy-paste). Based on a patch
originally from Doke Scott, ok djm@
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index cd8c27c8c..5f5a08a0a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.422 2009/08/16 23:35:22 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.423 2009/08/28 01:02:37 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.422 $) | 18 | AC_REVISION($Revision: 1.423 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -671,6 +671,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
671 | after setsid()]) | 671 | after setsid()]) |
672 | AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd | 672 | AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd |
673 | in case the name is longer than 8 chars]) | 673 | in case the name is longer than 8 chars]) |
674 | AC_DEFINE(BROKEN_TCGETATTR_ICANON, tcgetattr with ICANON may hang) | ||
674 | external_path_file=/etc/default/login | 675 | external_path_file=/etc/default/login |
675 | # hardwire lastlog location (can't detect it on some versions) | 676 | # hardwire lastlog location (can't detect it on some versions) |
676 | conf_lastlog_location="/var/adm/lastlog" | 677 | conf_lastlog_location="/var/adm/lastlog" |