4 files changed, 11 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index d94a6e342..10dc20a1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20020707
  - (tim) [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH)
+ - (tim) [acconfig.h configure.ac sshd.c]
+   s/BROKEN_FD_PASSING/DISABLE_FD_PASSING/
 
 20020705
  - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs.
@@ -1283,4 +1285,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2338 2002/07/07 20:30:45 tim Exp $
+$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 @@
-/* $Id: acconfig.h,v 1.141 2002/06/25 22:35:16 tim Exp $ */
+/* $Id: acconfig.h,v 1.142 2002/07/07 20:43:36 tim Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -358,8 +358,8 @@
 /* Define if you have the `mmap' function that supports MAP_ANON|SHARED */
 #undef HAVE_MMAP_ANON_SHARED
 
-/* Define if sendmsg()/recvmsg() has problems passing file descriptors */
-#undef BROKEN_FD_PASSING
+/* Define if your platform needs to skip post auth file descriptor passing */
+#undef DISABLE_FD_PASSING
 
 @BOTTOM@
 
diff --git a/configure.ac b/configure.ac
index 4b48be389..0f5ab9187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.74 2002/07/05 14:12:34 tim Exp $
+# $Id: configure.ac,v 1.75 2002/07/07 20:43:36 tim Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -91,7 +91,7 @@ case "$host" in
         AC_DEFINE(IPV4_DEFAULT)
         AC_DEFINE(IP_TOS_IS_BROKEN)
         AC_DEFINE(NO_X11_UNIX_SOCKETS)
-        AC_DEFINE(BROKEN_FD_PASSING)
+        AC_DEFINE(DISABLE_FD_PASSING)
         AC_DEFINE(SETGROUPS_NOOP)
         ;;
 *-*-dgux*)
@@ -272,7 +272,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(USE_PIPES)
         AC_DEFINE(HAVE_SECUREWARE)
         AC_DEFINE(DISABLE_SHADOW)
-        AC_DEFINE(BROKEN_FD_PASSING)
+        AC_DEFINE(DISABLE_FD_PASSING)
         AC_CHECK_FUNCS(getluid setluid)
         MANTYPE=man
         ;;
@@ -280,7 +280,7 @@ mips-sony-bsd|mips-sony-newsos4)
         no_libsocket=1
         no_libnsl=1
         AC_DEFINE(USE_PIPES)
-        AC_DEFINE(BROKEN_FD_PASSING)
+        AC_DEFINE(DISABLE_FD_PASSING)
         LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib"
         LIBS="$LIBS -lgen -lrsc"
         ;;
diff --git a/sshd.c b/sshd.c
index 5e5fc4716..c04f55f4b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -624,7 +624,7 @@ privsep_postauth(Authctxt *authctxt)
         /* XXX - Remote port forwarding */
         x_authctxt = authctxt;
 
-#ifdef BROKEN_FD_PASSING
+#ifdef DISABLE_FD_PASSING
         if (1) {
 #else
         if (authctxt->pw->pw_uid == 0 || options.use_login) {