Attachment 187 Details for Bug 245 – Don't call setsid() on Solaris only

[patch] Don't call setsid() on Solaris only

openssh-solaris_setsid.patch (text/plain), 1.89 KB, created by Darren Tucker on 2002-12-14 16:22:39 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2002-12-14 16:22:39 AEDT

Size: 1.89 KB

patch

obsolete

>Index: acconfig.h
>===================================================================
>RCS file: /cvs/openssh/acconfig.h,v
>retrieving revision 1.145
>diff -u -r1.145 acconfig.h
>--- acconfig.h	26 Sep 2002 00:38:48 -0000	1.145
>+++ acconfig.h	14 Dec 2002 04:46:41 -0000
>@@ -364,6 +364,9 @@
> /* Define if your platform needs to skip post auth file descriptor passing */
> #undef DISABLE_FD_PASSING
> 
>+/* Pushing STREAMS modules incorrectly acquires a controlling TTY */
>+#undef STREAMS_PUSH_ACQUIRES_CTTY
>+
> @BOTTOM@
> 
> /* ******************* Shouldn't need to edit below this line ************** */
>Index: configure.ac
>===================================================================
>RCS file: /cvs/openssh/configure.ac,v
>retrieving revision 1.93
>diff -u -r1.93 configure.ac
>--- configure.ac	22 Nov 2002 21:29:03 -0000	1.93
>+++ configure.ac	14 Dec 2002 04:46:42 -0000
>@@ -210,6 +210,7 @@
> 	AC_DEFINE(LOGIN_NEEDS_UTMPX)
> 	AC_DEFINE(LOGIN_NEEDS_TERM)
> 	AC_DEFINE(PAM_TTY_KLUDGE)
>+	AC_DEFINE(STREAMS_PUSH_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)
>Index: sshd.c
>===================================================================
>RCS file: /cvs/openssh/sshd.c,v
>retrieving revision 1.232
>diff -u -r1.232 sshd.c
>--- sshd.c	9 Nov 2002 15:50:05 -0000	1.232
>+++ sshd.c	14 Dec 2002 04:46:44 -0000
>@@ -1392,8 +1392,12 @@
> 	 * 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

Actions: View | Diff

Attachments on bug 245: 96 | 187