diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | sshd.c | 4 |
4 files changed, 15 insertions, 3 deletions
@@ -9,6 +9,8 @@ | |||
9 | - (tim) [contrib/caldera/openssh.spec] Sync with Caldera | 9 | - (tim) [contrib/caldera/openssh.spec] Sync with Caldera |
10 | - (bal) moved aix_usrinfo() and noted not setting real TTY. Patch by | 10 | - (bal) moved aix_usrinfo() and noted not setting real TTY. Patch by |
11 | dtucker@zip.com.au | 11 | dtucker@zip.com.au |
12 | - (tim) [acconfig.h configure.ac sshd.c] BROKEN_FD_PASSING fix from Markus | ||
13 | for Cygwin, Cray, & SCO | ||
12 | 14 | ||
13 | 20020624 | 15 | 20020624 |
14 | - OpenBSD CVS Sync | 16 | - OpenBSD CVS Sync |
@@ -1094,4 +1096,4 @@ | |||
1094 | - (stevesk) entropy.c: typo in debug message | 1096 | - (stevesk) entropy.c: typo in debug message |
1095 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1097 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1096 | 1098 | ||
1097 | $Id: ChangeLog,v 1.2271 2002/06/25 17:12:26 mouring Exp $ | 1099 | $Id: ChangeLog,v 1.2272 2002/06/25 22:35:15 tim Exp $ |
diff --git a/acconfig.h b/acconfig.h index 0bf305bb8..3e51d6112 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.140 2002/06/25 03:22:04 mouring Exp $ */ | 1 | /* $Id: acconfig.h,v 1.141 2002/06/25 22:35:16 tim Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -358,6 +358,9 @@ | |||
358 | /* Define if you have the `mmap' function that supports MAP_ANON|SHARED */ | 358 | /* Define if you have the `mmap' function that supports MAP_ANON|SHARED */ |
359 | #undef HAVE_MMAP_ANON_SHARED | 359 | #undef HAVE_MMAP_ANON_SHARED |
360 | 360 | ||
361 | /* Define if sendmsg()/recvmsg() has problems passing file descriptors */ | ||
362 | #undef BROKEN_FD_PASSING | ||
363 | |||
361 | @BOTTOM@ | 364 | @BOTTOM@ |
362 | 365 | ||
363 | /* ******************* Shouldn't need to edit below this line ************** */ | 366 | /* ******************* Shouldn't need to edit below this line ************** */ |
diff --git a/configure.ac b/configure.ac index a99860334..ad5d5cde9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.71 2002/06/25 03:22:04 mouring Exp $ | 1 | # $Id: configure.ac,v 1.72 2002/06/25 22:35:16 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -86,6 +86,7 @@ case "$host" in | |||
86 | AC_DEFINE(IPV4_DEFAULT) | 86 | AC_DEFINE(IPV4_DEFAULT) |
87 | AC_DEFINE(IP_TOS_IS_BROKEN) | 87 | AC_DEFINE(IP_TOS_IS_BROKEN) |
88 | AC_DEFINE(NO_X11_UNIX_SOCKETS) | 88 | AC_DEFINE(NO_X11_UNIX_SOCKETS) |
89 | AC_DEFINE(BROKEN_FD_PASSING) | ||
89 | AC_DEFINE(SETGROUPS_NOOP) | 90 | AC_DEFINE(SETGROUPS_NOOP) |
90 | ;; | 91 | ;; |
91 | *-*-dgux*) | 92 | *-*-dgux*) |
@@ -266,6 +267,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
266 | AC_DEFINE(USE_PIPES) | 267 | AC_DEFINE(USE_PIPES) |
267 | AC_DEFINE(HAVE_SECUREWARE) | 268 | AC_DEFINE(HAVE_SECUREWARE) |
268 | AC_DEFINE(DISABLE_SHADOW) | 269 | AC_DEFINE(DISABLE_SHADOW) |
270 | AC_DEFINE(BROKEN_FD_PASSING) | ||
269 | AC_CHECK_FUNCS(getluid setluid) | 271 | AC_CHECK_FUNCS(getluid setluid) |
270 | MANTYPE=man | 272 | MANTYPE=man |
271 | ;; | 273 | ;; |
@@ -273,6 +275,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
273 | no_libsocket=1 | 275 | no_libsocket=1 |
274 | no_libnsl=1 | 276 | no_libnsl=1 |
275 | AC_DEFINE(USE_PIPES) | 277 | AC_DEFINE(USE_PIPES) |
278 | AC_DEFINE(BROKEN_FD_PASSING) | ||
276 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" | 279 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" |
277 | LIBS="$LIBS -lgen -lrsc" | 280 | LIBS="$LIBS -lgen -lrsc" |
278 | ;; | 281 | ;; |
@@ -613,7 +613,11 @@ privsep_postauth(Authctxt *authctxt) | |||
613 | /* XXX - Remote port forwarding */ | 613 | /* XXX - Remote port forwarding */ |
614 | x_authctxt = authctxt; | 614 | x_authctxt = authctxt; |
615 | 615 | ||
616 | #ifdef BROKEN_FD_PASSING | ||
617 | if (1) { | ||
618 | #else | ||
616 | if (authctxt->pw->pw_uid == 0 || options.use_login) { | 619 | if (authctxt->pw->pw_uid == 0 || options.use_login) { |
620 | #endif | ||
617 | /* File descriptor passing is broken or root login */ | 621 | /* File descriptor passing is broken or root login */ |
618 | monitor_apply_keystate(pmonitor); | 622 | monitor_apply_keystate(pmonitor); |
619 | use_privsep = 0; | 623 | use_privsep = 0; |