4 files changed, 8 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 60dcf8ebe..57b75d24b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
      [dh.c kex.c packet.c]
      clear+free keys,iv for rekeying.
      + fix DH mem leaks. ok niels@
+ - (stevesk) don't use vhangup() if defined(HAVE_DEV_PTMX); also removes
+    BROKEN_VHANGUP
 
 20010404
  - OpenBSD CVS Sync
@@ -4867,4 +4869,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1061 2001/04/05 02:05:21 mouring Exp $
+$Id: ChangeLog,v 1.1062 2001/04/05 17:15:08 stevesk Exp $
diff --git a/acconfig.h b/acconfig.h
index 928277a36..b4cfe0401 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.109 2001/03/28 04:35:30 djm Exp $ */
+/* $Id: acconfig.h,v 1.110 2001/04/05 17:15:08 stevesk Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -284,9 +284,6 @@
 /* getaddrinfo is broken (if present) */
 #undef BROKEN_GETADDRINFO
 
-/* vhangup is broken (if present) */
-#undef BROKEN_VHANGUP
-
 /* Workaround more Linux IPv6 quirks */
 #undef DONT_TRY_OTHER_AF
 
diff --git a/configure.in b/configure.in
index 792e629c5..05e796953 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.271 2001/03/28 11:05:27 djm Exp $
+# $Id: configure.in,v 1.272 2001/04/05 17:15:08 stevesk Exp $
 
 AC_INIT(ssh.c)
 
@@ -71,7 +71,6 @@ case "$host" in
         AC_DEFINE(DISABLE_SHADOW)
         AC_DEFINE(IPV4_DEFAULT)
         AC_DEFINE(IP_TOS_IS_BROKEN)
-        AC_DEFINE(BROKEN_VHANGUP)
         AC_DEFINE(NO_X11_UNIX_SOCKETS)
         no_libsocket=1
         no_libnsl=1
diff --git a/defines.h b/defines.h
index 7f8889351..c40096d31 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.61 2001/03/20 02:31:45 tim Exp $ */
+/* $Id: defines.h,v 1.62 2001/04/05 17:15:08 stevesk Exp $ */
 
 /* Some platforms need this for the _r() functions */
 #if !defined(_REENTRANT) && !defined(SNI)
@@ -421,9 +421,9 @@ struct winsize {
 # endif /* defined(HAVE_XATEXIT) */
 #endif /* !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT) */
 
-#if defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP)
+#if defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX)
 #  define USE_VHANGUP
-#endif /* defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP) */
+#endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */
 
 #ifndef GETPGRP_VOID
 # define getpgrp() getpgrp(0)