tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[acconfig.h configure.ac sshd.c] BROKEN_FD_PASSING fix from Markus 

for Cygwin, Cray, & SCO
This commit is contained in:
Tim Rice 2002-06-25 15:35:15 -07:00
parent b129be657c
commit 8eff319298
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -9,6 +9,8 @@
- (tim) [contrib/caldera/openssh.spec] Sync with Caldera - (tim) [contrib/caldera/openssh.spec] Sync with Caldera
- (bal) moved aix_usrinfo() and noted not setting real TTY. Patch by - (bal) moved aix_usrinfo() and noted not setting real TTY. Patch by
dtucker@zip.com.au dtucker@zip.com.au
- (tim) [acconfig.h configure.ac sshd.c] BROKEN_FD_PASSING fix from Markus
for Cygwin, Cray, & SCO
20020624 20020624
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -1094,4 +1096,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2271 2002/06/25 17:12:26 mouring Exp $ $Id: ChangeLog,v 1.2272 2002/06/25 22:35:15 tim Exp $

5
acconfig.h
View File

@ -1,4 +1,4 @@
/* $Id: acconfig.h,v 1.140 2002/06/25 03:22:04 mouring Exp $ */ /* $Id: acconfig.h,v 1.141 2002/06/25 22:35:16 tim Exp $ */
#ifndef _CONFIG_H #ifndef _CONFIG_H
#define _CONFIG_H #define _CONFIG_H
@ -358,6 +358,9 @@
/* Define if you have the `mmap' function that supports MAP_ANON|SHARED */ /* Define if you have the `mmap' function that supports MAP_ANON|SHARED */
#undef HAVE_MMAP_ANON_SHARED #undef HAVE_MMAP_ANON_SHARED
/* Define if sendmsg()/recvmsg() has problems passing file descriptors */
#undef BROKEN_FD_PASSING
@BOTTOM@ @BOTTOM@
/* ******************* Shouldn't need to edit below this line ************** */ /* ******************* Shouldn't need to edit below this line ************** */

5
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.71 2002/06/25 03:22:04 mouring Exp $ # $Id: configure.ac,v 1.72 2002/06/25 22:35:16 tim Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -86,6 +86,7 @@ case "$host" in
AC_DEFINE(IPV4_DEFAULT) AC_DEFINE(IPV4_DEFAULT)
AC_DEFINE(IP_TOS_IS_BROKEN) AC_DEFINE(IP_TOS_IS_BROKEN)
AC_DEFINE(NO_X11_UNIX_SOCKETS) AC_DEFINE(NO_X11_UNIX_SOCKETS)
AC_DEFINE(BROKEN_FD_PASSING)
AC_DEFINE(SETGROUPS_NOOP) AC_DEFINE(SETGROUPS_NOOP)
;; ;;
*-*-dgux*) *-*-dgux*)
@ -266,6 +267,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(HAVE_SECUREWARE) AC_DEFINE(HAVE_SECUREWARE)
AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(BROKEN_FD_PASSING)
AC_CHECK_FUNCS(getluid setluid) AC_CHECK_FUNCS(getluid setluid)
MANTYPE=man MANTYPE=man
;; ;;
@ -273,6 +275,7 @@ mips-sony-bsd|mips-sony-newsos4)
no_libsocket=1 no_libsocket=1
no_libnsl=1 no_libnsl=1
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(BROKEN_FD_PASSING)
LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib"
LIBS="$LIBS -lgen -lrsc" LIBS="$LIBS -lgen -lrsc"
;; ;;

4
sshd.c
View File

@ -613,7 +613,11 @@ privsep_postauth(Authctxt *authctxt)
/* XXX - Remote port forwarding */ /* XXX - Remote port forwarding */
x_authctxt = authctxt; x_authctxt = authctxt;
#ifdef BROKEN_FD_PASSING
if (1) {
#else
if (authctxt->pw->pw_uid == 0 || options.use_login) { if (authctxt->pw->pw_uid == 0 || options.use_login) {
#endif
/* File descriptor passing is broken or root login */ /* File descriptor passing is broken or root login */
monitor_apply_keystate(pmonitor); monitor_apply_keystate(pmonitor);
use_privsep = 0; use_privsep = 0;