summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--acconfig.h5
-rw-r--r--configure.ac9
-rw-r--r--defines.h10
4 files changed, 7 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d922f9f1..c9c7ac9f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
16 - (bal) Revered out of runtime IRIX detection of joblimits. Code is 16 - (bal) Revered out of runtime IRIX detection of joblimits. Code is
17 incomplete. 17 incomplete.
18 - (bal) Quiet down configure.ac if /bin/test does not exist. 18 - (bal) Quiet down configure.ac if /bin/test does not exist.
19 - (bal) We no longer use atexit()/xatexit()/on_exit()
19 20
2020020405 2120020405
21 - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by 22 - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by
@@ -8186,4 +8187,4 @@
8186 - Wrote replacements for strlcpy and mkdtemp 8187 - Wrote replacements for strlcpy and mkdtemp
8187 - Released 1.0pre1 8188 - Released 1.0pre1
8188 8189
8189$Id: ChangeLog,v 1.2032 2002/04/06 20:30:07 mouring Exp $ 8190$Id: ChangeLog,v 1.2033 2002/04/06 23:52:02 mouring Exp $
diff --git a/acconfig.h b/acconfig.h
index c7003fe55..00fdfac63 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
1/* $Id: acconfig.h,v 1.126 2002/04/05 20:23:37 mouring Exp $ */ 1/* $Id: acconfig.h,v 1.127 2002/04/06 23:52:04 mouring Exp $ */
2 2
3#ifndef _CONFIG_H 3#ifndef _CONFIG_H
4#define _CONFIG_H 4#define _CONFIG_H
@@ -283,9 +283,6 @@
283/* Use IPv4 for connection by default, IPv6 can still if explicity asked */ 283/* Use IPv4 for connection by default, IPv6 can still if explicity asked */
284#undef IPV4_DEFAULT 284#undef IPV4_DEFAULT
285 285
286/* If you have no atexit() but xatexit(), and want to use xatexit() */
287#undef HAVE_XATEXIT
288
289/* getaddrinfo is broken (if present) */ 286/* getaddrinfo is broken (if present) */
290#undef BROKEN_GETADDRINFO 287#undef BROKEN_GETADDRINFO
291 288
diff --git a/configure.ac b/configure.ac
index a9dea2eec..abe9a1a42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.34 2002/04/06 20:30:09 mouring Exp $ 1# $Id: configure.ac,v 1.35 2002/04/06 23:52:04 mouring Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -127,9 +127,6 @@ case "$host" in
127mips-sony-bsd|mips-sony-newsos4) 127mips-sony-bsd|mips-sony-newsos4)
128 AC_DEFINE(HAVE_NEWS4) 128 AC_DEFINE(HAVE_NEWS4)
129 SONY=1 129 SONY=1
130 AC_CHECK_LIB(iberty, xatexit, AC_DEFINE(HAVE_XATEXIT),
131 AC_MSG_ERROR([*** libiberty missing - please install first or check config.log ***])
132 )
133 ;; 130 ;;
134*-*-netbsd*) 131*-*-netbsd*)
135 need_dash_r=1 132 need_dash_r=1
@@ -532,12 +529,12 @@ AC_ARG_WITH(tcp-wrappers,
532) 529)
533 530
534dnl Checks for library functions. 531dnl Checks for library functions.
535AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa \ 532AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
536 clock fchmod fchown freeaddrinfo futimes gai_strerror \ 533 clock fchmod fchown freeaddrinfo futimes gai_strerror \
537 getaddrinfo getcwd getgrouplist getnameinfo getopt \ 534 getaddrinfo getcwd getgrouplist getnameinfo getopt \
538 getrlimit getrusage getttyent glob inet_aton inet_ntoa \ 535 getrlimit getrusage getttyent glob inet_aton inet_ntoa \
539 inet_ntop innetgr login_getcapbool md5_crypt memmove \ 536 inet_ntop innetgr login_getcapbool md5_crypt memmove \
540 mkdtemp on_exit openpty readpassphrase realpath \ 537 mkdtemp openpty readpassphrase realpath \
541 rresvport_af setdtablesize setegid setenv seteuid \ 538 rresvport_af setdtablesize setegid setenv seteuid \
542 setlogin setproctitle setresgid setreuid setrlimit \ 539 setlogin setproctitle setresgid setreuid setrlimit \
543 setsid setvbuf sigaction sigvec snprintf strerror \ 540 setsid setvbuf sigaction sigvec snprintf strerror \
diff --git a/defines.h b/defines.h
index ec0d8e587..d6a6a1470 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.84 2002/03/22 21:08:04 stevesk Exp $ */ 4/* $Id: defines.h,v 1.85 2002/04/06 23:52:05 mouring Exp $ */
5 5
6/* Necessary headers */ 6/* Necessary headers */
7 7
@@ -493,14 +493,6 @@ struct winsize {
493# define memmove(s1, s2, n) bcopy((s2), (s1), (n)) 493# define memmove(s1, s2, n) bcopy((s2), (s1), (n))
494#endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ 494#endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */
495 495
496#if !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT)
497# define atexit(a) on_exit(a, NULL)
498#else
499# if defined(HAVE_XATEXIT)
500# define atexit(a) xatexit(a)
501# endif /* defined(HAVE_XATEXIT) */
502#endif /* !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT) */
503
504#if defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) 496#if defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX)
505# define USE_VHANGUP 497# define USE_VHANGUP
506#endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */ 498#endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */