Attachment 282 Details for Bug 536 – Don't call setsid() on Linux 2.0 and 2.2

[patch] Don't call setsid() on Linux 2.0 and 2.2

openssh-linux20_ctty.patch (text/plain), 2.65 KB, created by Darren Tucker on 2003-05-06 19:36:26 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2003-05-06 19:36:26 AEST

Size: 2.65 KB

patch

obsolete

>Index: acconfig.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/acconfig.h,v
>retrieving revision 1.150
>diff -u -r1.150 acconfig.h
>--- acconfig.h	2 May 2003 10:48:21 -0000	1.150
>+++ acconfig.h	6 May 2003 07:48:27 -0000
>@@ -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
> 
> /* Define if cmsg_type is not passed correctly */
> #undef BROKEN_CMSG_TYPE
>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.115
>diff -u -r1.115 configure.ac
>--- configure.ac	2 May 2003 10:48:21 -0000	1.115
>+++ configure.ac	6 May 2003 08:38:01 -0000
>@@ -188,14 +188,13 @@
> 	AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_CLOBBER_ARGV)
> 	AC_DEFINE(SETPROCTITLE_PS_PADDING, '\0')
> 	inet6_default_4in6=yes
>-	AC_MSG_CHECKING(for broken cmsg_type)
> 	case `uname -r` in
> 	2.0.*)
>-		AC_MSG_RESULT(yes)
> 		AC_DEFINE(BROKEN_CMSG_TYPE)
>+		AC_DEFINE(SSHD_ACQUIRES_CTTY)
> 		;;
>-	*)
>-		AC_MSG_RESULT(no)
>+	2.2.*)
>+		AC_DEFINE(SSHD_ACQUIRES_CTTY)
> 		;;
> 	esac
> 	;;
>@@ -230,7 +229,7 @@
> 	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)
>Index: sshd.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/sshd.c,v
>retrieving revision 1.237
>diff -u -r1.237 sshd.c
>--- sshd.c	9 Apr 2003 10:59:50 -0000	1.237
>+++ sshd.c	6 May 2003 09:01:55 -0000
>@@ -1400,11 +1400,11 @@
> 	 * 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
>-	 * shell from acquiring it later.
>+	 * If setsid is called on some platforms, sshd will later acquire a
>+	 * controlling terminal, which will cause "could not set controlling
>+	 * tty" errors. On Solaris, this happens while pushing STREAMS modules.
> 	 */
> 	if (!debug_flag && !inetd_flag && setsid() < 0)
> 		error("setsid: %.100s", strerror(errno));

Actions: View | Diff

Attachments on bug 536: 282 | 283 | 284 | 285 | 286