diff options
author | Tim Rice <tim@multitalents.net> | 2002-07-07 13:43:36 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2002-07-07 13:43:36 -0700 |
commit | 9dd30817ef4314bd2fdc688c0d40fd6ca7208acc (patch) | |
tree | d214a286c76aeaa03928cef4cc1b040d07acf606 | |
parent | cc25206d31a783c9c0834f59904d97bc1cba3f07 (diff) |
[acconfig.h configure.ac sshd.c] s/BROKEN_FD_PASSING/DISABLE_FD_PASSING/
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acconfig.h | 6 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | sshd.c | 2 |
4 files changed, 11 insertions, 9 deletions
@@ -1,5 +1,7 @@ | |||
1 | 20020707 | 1 | 20020707 |
2 | - (tim) [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH) | 2 | - (tim) [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH) |
3 | - (tim) [acconfig.h configure.ac sshd.c] | ||
4 | s/BROKEN_FD_PASSING/DISABLE_FD_PASSING/ | ||
3 | 5 | ||
4 | 20020705 | 6 | 20020705 |
5 | - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs. | 7 | - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs. |
@@ -1283,4 +1285,4 @@ | |||
1283 | - (stevesk) entropy.c: typo in debug message | 1285 | - (stevesk) entropy.c: typo in debug message |
1284 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1286 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1285 | 1287 | ||
1286 | $Id: ChangeLog,v 1.2338 2002/07/07 20:30:45 tim Exp $ | 1288 | $Id: ChangeLog,v 1.2339 2002/07/07 20:43:36 tim Exp $ |
diff --git a/acconfig.h b/acconfig.h index 3e51d6112..d809d059d 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.141 2002/06/25 22:35:16 tim Exp $ */ | 1 | /* $Id: acconfig.h,v 1.142 2002/07/07 20:43:36 tim Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -358,8 +358,8 @@ | |||
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 */ | 361 | /* Define if your platform needs to skip post auth file descriptor passing */ |
362 | #undef BROKEN_FD_PASSING | 362 | #undef DISABLE_FD_PASSING |
363 | 363 | ||
364 | @BOTTOM@ | 364 | @BOTTOM@ |
365 | 365 | ||
diff --git a/configure.ac b/configure.ac index 4b48be389..0f5ab9187 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.74 2002/07/05 14:12:34 tim Exp $ | 1 | # $Id: configure.ac,v 1.75 2002/07/07 20:43:36 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -91,7 +91,7 @@ case "$host" in | |||
91 | AC_DEFINE(IPV4_DEFAULT) | 91 | AC_DEFINE(IPV4_DEFAULT) |
92 | AC_DEFINE(IP_TOS_IS_BROKEN) | 92 | AC_DEFINE(IP_TOS_IS_BROKEN) |
93 | AC_DEFINE(NO_X11_UNIX_SOCKETS) | 93 | AC_DEFINE(NO_X11_UNIX_SOCKETS) |
94 | AC_DEFINE(BROKEN_FD_PASSING) | 94 | AC_DEFINE(DISABLE_FD_PASSING) |
95 | AC_DEFINE(SETGROUPS_NOOP) | 95 | AC_DEFINE(SETGROUPS_NOOP) |
96 | ;; | 96 | ;; |
97 | *-*-dgux*) | 97 | *-*-dgux*) |
@@ -272,7 +272,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
272 | AC_DEFINE(USE_PIPES) | 272 | AC_DEFINE(USE_PIPES) |
273 | AC_DEFINE(HAVE_SECUREWARE) | 273 | AC_DEFINE(HAVE_SECUREWARE) |
274 | AC_DEFINE(DISABLE_SHADOW) | 274 | AC_DEFINE(DISABLE_SHADOW) |
275 | AC_DEFINE(BROKEN_FD_PASSING) | 275 | AC_DEFINE(DISABLE_FD_PASSING) |
276 | AC_CHECK_FUNCS(getluid setluid) | 276 | AC_CHECK_FUNCS(getluid setluid) |
277 | MANTYPE=man | 277 | MANTYPE=man |
278 | ;; | 278 | ;; |
@@ -280,7 +280,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
280 | no_libsocket=1 | 280 | no_libsocket=1 |
281 | no_libnsl=1 | 281 | no_libnsl=1 |
282 | AC_DEFINE(USE_PIPES) | 282 | AC_DEFINE(USE_PIPES) |
283 | AC_DEFINE(BROKEN_FD_PASSING) | 283 | AC_DEFINE(DISABLE_FD_PASSING) |
284 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" | 284 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" |
285 | LIBS="$LIBS -lgen -lrsc" | 285 | LIBS="$LIBS -lgen -lrsc" |
286 | ;; | 286 | ;; |
@@ -624,7 +624,7 @@ privsep_postauth(Authctxt *authctxt) | |||
624 | /* XXX - Remote port forwarding */ | 624 | /* XXX - Remote port forwarding */ |
625 | x_authctxt = authctxt; | 625 | x_authctxt = authctxt; |
626 | 626 | ||
627 | #ifdef BROKEN_FD_PASSING | 627 | #ifdef DISABLE_FD_PASSING |
628 | if (1) { | 628 | if (1) { |
629 | #else | 629 | #else |
630 | if (authctxt->pw->pw_uid == 0 || options.use_login) { | 630 | if (authctxt->pw->pw_uid == 0 || options.use_login) { |