summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--acconfig.h5
-rw-r--r--configure.in3
-rw-r--r--defines.h6
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 @@
28 [dh.c kex.c packet.c] 28 [dh.c kex.c packet.c]
29 clear+free keys,iv for rekeying. 29 clear+free keys,iv for rekeying.
30 + fix DH mem leaks. ok niels@ 30 + fix DH mem leaks. ok niels@
31 - (stevesk) don't use vhangup() if defined(HAVE_DEV_PTMX); also removes
32 BROKEN_VHANGUP
31 33
3220010404 3420010404
33 - OpenBSD CVS Sync 35 - OpenBSD CVS Sync
@@ -4867,4 +4869,4 @@
4867 - Wrote replacements for strlcpy and mkdtemp 4869 - Wrote replacements for strlcpy and mkdtemp
4868 - Released 1.0pre1 4870 - Released 1.0pre1
4869 4871
4870$Id: ChangeLog,v 1.1061 2001/04/05 02:05:21 mouring Exp $ 4872$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 @@
1/* $Id: acconfig.h,v 1.109 2001/03/28 04:35:30 djm Exp $ */ 1/* $Id: acconfig.h,v 1.110 2001/04/05 17:15:08 stevesk Exp $ */
2 2
3#ifndef _CONFIG_H 3#ifndef _CONFIG_H
4#define _CONFIG_H 4#define _CONFIG_H
@@ -284,9 +284,6 @@
284/* getaddrinfo is broken (if present) */ 284/* getaddrinfo is broken (if present) */
285#undef BROKEN_GETADDRINFO 285#undef BROKEN_GETADDRINFO
286 286
287/* vhangup is broken (if present) */
288#undef BROKEN_VHANGUP
289
290/* Workaround more Linux IPv6 quirks */ 287/* Workaround more Linux IPv6 quirks */
291#undef DONT_TRY_OTHER_AF 288#undef DONT_TRY_OTHER_AF
292 289
diff --git a/configure.in b/configure.in
index 792e629c5..05e796953 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
1# $Id: configure.in,v 1.271 2001/03/28 11:05:27 djm Exp $ 1# $Id: configure.in,v 1.272 2001/04/05 17:15:08 stevesk Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -71,7 +71,6 @@ case "$host" in
71 AC_DEFINE(DISABLE_SHADOW) 71 AC_DEFINE(DISABLE_SHADOW)
72 AC_DEFINE(IPV4_DEFAULT) 72 AC_DEFINE(IPV4_DEFAULT)
73 AC_DEFINE(IP_TOS_IS_BROKEN) 73 AC_DEFINE(IP_TOS_IS_BROKEN)
74 AC_DEFINE(BROKEN_VHANGUP)
75 AC_DEFINE(NO_X11_UNIX_SOCKETS) 74 AC_DEFINE(NO_X11_UNIX_SOCKETS)
76 no_libsocket=1 75 no_libsocket=1
77 no_libnsl=1 76 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 @@
1#ifndef _DEFINES_H 1#ifndef _DEFINES_H
2#define _DEFINES_H 2#define _DEFINES_H
3 3
4/* $Id: defines.h,v 1.61 2001/03/20 02:31:45 tim Exp $ */ 4/* $Id: defines.h,v 1.62 2001/04/05 17:15:08 stevesk Exp $ */
5 5
6/* Some platforms need this for the _r() functions */ 6/* Some platforms need this for the _r() functions */
7#if !defined(_REENTRANT) && !defined(SNI) 7#if !defined(_REENTRANT) && !defined(SNI)
@@ -421,9 +421,9 @@ struct winsize {
421# endif /* defined(HAVE_XATEXIT) */ 421# endif /* defined(HAVE_XATEXIT) */
422#endif /* !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT) */ 422#endif /* !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT) */
423 423
424#if defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP) 424#if defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX)
425# define USE_VHANGUP 425# define USE_VHANGUP
426#endif /* defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP) */ 426#endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */
427 427
428#ifndef GETPGRP_VOID 428#ifndef GETPGRP_VOID
429# define getpgrp() getpgrp(0) 429# define getpgrp() getpgrp(0)