diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-08-21 17:42:33 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-08-21 17:42:33 +1000 |
commit | 25fbd6283705f897adff28232673baae657d8b31 (patch) | |
tree | 346a18a776a7ea2711ee5bec288b31eca335b7b9 | |
parent | acc0d05cbc880c4caf52cf6956fc3ea23cb81d39 (diff) |
- (dtucker) [acconfig.h configure.ac sshd.c] STREAMS_PUSH_ACQUIRES_CTTY ->
SSHD_ACQUIRES_CTTY.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acconfig.h | 6 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | sshd.c | 2 |
4 files changed, 11 insertions, 9 deletions
@@ -14,6 +14,8 @@ from OpenBSD. - (dtucker) [configure.ac monitor_fdpass.c] Bug #544: ignore invalid cmsg_type on Linux 1.x and 2.0 kernels, privsep should now work. + - (dtucker) [acconfig.h configure.ac sshd.c] STREAMS_PUSH_ACQUIRES_CTTY -> + SSHD_ACQUIRES_CTTY. 20030429 - (djm) Add back radix.o (used by AFS support), after it went missing from @@ -1319,4 +1321,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2648.2.7 2003/08/21 07:38:20 dtucker Exp $ +$Id: ChangeLog,v 1.2648.2.8 2003/08/21 07:42:33 dtucker Exp $ @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.149 2003/03/10 00:38:10 djm Exp $ */ +/* $Id: acconfig.h,v 1.149.4.1 2003/08/21 07:42:34 dtucker Exp $ */ #ifndef _CONFIG_H #define _CONFIG_H @@ -374,8 +374,8 @@ /* Some systems put this outside of libc */ #undef HAVE_NANOSLEEP -/* Pushing STREAMS modules incorrectly acquires a controlling TTY */ -#undef STREAMS_PUSH_ACQUIRES_CTTY +/* Define if sshd somehow reacquires a controlling TTY after setsid() */ +#undef SSHD_ACQUIRES_CTTY @BOTTOM@ diff --git a/configure.ac b/configure.ac index 3d785905..72e75cd9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.113.2.3 2003/08/21 07:38:20 dtucker Exp $ +# $Id: configure.ac,v 1.113.2.4 2003/08/21 07:42:34 dtucker Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -224,7 +224,7 @@ mips-sony-bsd|mips-sony-newsos4) AC_DEFINE(LOGIN_NEEDS_UTMPX) AC_DEFINE(LOGIN_NEEDS_TERM) AC_DEFINE(PAM_TTY_KLUDGE) - AC_DEFINE(STREAMS_PUSH_ACQUIRES_CTTY) + AC_DEFINE(SSHD_ACQUIRES_CTTY) # hardwire lastlog location (can't detect it on some versions) conf_lastlog_location="/var/adm/lastlog" AC_MSG_CHECKING(for obsolete utmp and wtmp in solaris2.x) @@ -251,7 +251,7 @@ mips-sony-bsd|mips-sony-newsos4) LDFLAGS="$LDFLAGS -L/usr/local/lib" LIBS="$LIBS -lc89" AC_DEFINE(USE_PIPES) - AC_DEFINE(STREAMS_PUSH_ACQUIRES_CTTY) + AC_DEFINE(SSHD_ACQUIRES_CTTY) ;; *-sni-sysv*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" @@ -260,7 +260,7 @@ mips-sony-bsd|mips-sony-newsos4) IPADDR_IN_DISPLAY=yes AC_DEFINE(USE_PIPES) AC_DEFINE(IP_TOS_IS_BROKEN) - AC_DEFINE(STREAMS_PUSH_ACQUIRES_CTTY) + AC_DEFINE(SSHD_ACQUIRES_CTTY) # /usr/ucblib/libucb.a no longer needed on ReliantUNIX # Attention: always take care to bind libsocket and libnsl before libc, # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog @@ -1401,7 +1401,7 @@ main(int ac, char **av) * setlogin() affects the entire process group. We don't * want the child to be able to affect the parent. */ -#if !defined(STREAMS_PUSH_ACQUIRES_CTTY) +#if !defined(SSHD_ACQUIRES_CTTY) /* * If setsid is called on Solaris, sshd will acquire the controlling * terminal while pushing STREAMS modules. This will prevent the |