[acconfig.h configure.ac sshd.c] s/BROKEN_FD_PASSING/DISABLE_FD_PASSING/

diff --git a/ChangeLog b/ChangeLog
index 1d493f8341c52ea843f34c4714edb798a4288af1..94772a81a0976b4fe27e556a3eb80c31636748d5 100644 (file)
--- 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.

diff --git a/acconfig.h b/acconfig.h
index 37227e7fe4c2ddee2e189ac39707d27247dc1866..aa8b6782505c703aebcaad2f871b81ae5eb6a2f8 100644 (file)
--- a/acconfig.h
+++ b/acconfig.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 d4dd2026ab38bed676c2147a83bf925dbe1fc56a..5e9e287c0bd3879602c8696cc604004d12b07db0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 5e5fc47164b580d62cff3c142213e0db9e43feb9..c04f55f4be703cbc4e84fb0e5df3fb220712fc1d 100644 (file)
--- 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) {