From 86c9e193c88d0143207ca458b9a3f78f23a0d6b9 Mon Sep 17 00:00:00 2001
From: stevesk <stevesk>
Date: Thu, 5 Apr 2001 17:15:08 +0000
Subject: [PATCH]  - (stevesk) don't use vhangup() if defined(HAVE_DEV_PTMX);
 also removes      BROKEN_VHANGUP

---
 ChangeLog    | 2 ++
 acconfig.h   | 3 ---
 configure.in | 1 -
 defines.h    | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afd63fe2..3c26df1b 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
diff --git a/acconfig.h b/acconfig.h
index ce668d6c..52154fa5 100644
--- a/acconfig.h
+++ b/acconfig.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 d1ffaa83..3c3cc7fe 100644
--- a/configure.in
+++ b/configure.in
@@ -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 83bffc95..ab60e5b7 100644
--- a/defines.h
+++ b/defines.h
@@ -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)
-- 
2.45.1