Attachment 272 Details for Bug 544 – Define BROKEN_CMSG_TYPE for Linux 2.0 kernels

[patch] Define BROKEN_CMSG_TYPE for Linux 2.0 kernels

openssh-linux20_privsep.patch (text/plain), 1.87 KB, created by Darren Tucker on 2003-04-20 22:34:13 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2003-04-20 22:34:13 AEST

Size: 1.87 KB

patch

obsolete

>Index: acconfig.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/acconfig.h,v
>retrieving revision 1.149
>diff -u -r1.149 acconfig.h
>--- acconfig.h	10 Mar 2003 00:38:10 -0000	1.149
>+++ acconfig.h	19 Apr 2003 07:18:35 -0000
>@@ -377,6 +377,9 @@
> /* Pushing STREAMS modules incorrectly acquires a controlling TTY */
> #undef STREAMS_PUSH_ACQUIRES_CTTY
> 
>+/* Define if cmsg_type is not passed correctly */
>+#undef BROKEN_CMSG_TYPE
>+
> @BOTTOM@
> 
> /* ******************* Shouldn't need to edit below this line ************** */
>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.113
>diff -u -r1.113 configure.ac
>--- configure.ac	21 Mar 2003 01:18:09 -0000	1.113
>+++ configure.ac	20 Apr 2003 12:14:10 -0000
>@@ -184,6 +184,16 @@
> 	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_MSG_RESULT(no)
>+		;;
>+	esac
> 	;;
> mips-sony-bsd|mips-sony-newsos4)
> 	AC_DEFINE(HAVE_NEWS4)
>Index: monitor_fdpass.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/monitor_fdpass.c,v
>retrieving revision 1.11
>diff -u -r1.11 monitor_fdpass.c
>--- monitor_fdpass.c	27 Jun 2002 00:21:03 -0000	1.11
>+++ monitor_fdpass.c	20 Apr 2003 12:27:56 -0000
>@@ -113,9 +113,11 @@
> 		fatal("%s: no fd", __func__);
> #else
> 	cmsg = CMSG_FIRSTHDR(&msg);
>+#ifndef BROKEN_CMSG_TYPE
> 	if (cmsg->cmsg_type != SCM_RIGHTS)
> 		fatal("%s: expected type %d got %d", __func__,
> 		    SCM_RIGHTS, cmsg->cmsg_type);
>+#endif
> 	fd = (*(int *)CMSG_DATA(cmsg));
> #endif
> 	return fd;

Actions: View | Diff

Attachments on bug 544: 271 | 272