- (dtucker) [acconfig.h configure.ac sshd.c] STREAMS_PUSH_ACQUIRES_CTTY ->

   SSHD_ACQUIRES_CTTY.

diff --git a/ChangeLog b/ChangeLog
index f45e488fd68d66f622e66a44c2e82cd53103e08e..fed36dcad077a337fc37143e0c36256f55e984ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/acconfig.h b/acconfig.h
index 3b919d553ea67e1292492fea708d0b809cf953e4..1c65dacc84c297fc55295017ca67bb119a51472b 100644 (file)
--- a/acconfig.h
+++ b/acconfig.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 95bad9e225c58ddac8fdbe7fc1c450663fd06033..60b3b656ecf07bb341733a60407d19c2fb4ecfa4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/sshd.c b/sshd.c
index a30a787c7e77951b677adbd97810bbc90e6575cb..24b886ecc47bf7fb073fe5e59ba19955c02af8d0 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -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