1 files changed, 6 insertions, 2 deletions

diff --git a/sshd.c b/sshd.c
index 86441cff1..0f2b2a3ce 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1400,8 +1400,12 @@ 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 0
-        /* XXX: this breaks Solaris */
+#if !defined(STREAMS_PUSH_ACQUIRES_CTTY)
+        /*
+         * If setsid is called on Solaris, sshd will acquire the controlling
+         * terminal while pushing STREAMS modules. This will prevent the
+         * shell from acquiring it later.
+         */
         if (!debug_flag && !inetd_flag && setsid() < 0)
                 error("setsid: %.100s", strerror(errno));
 #endif