summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-01-04 09:07:12 +1100
committerDamien Miller <djm@mindrot.org>2001-01-04 09:07:12 +1100
commitd54e55cf5c98bcc2d6397f7bfe4362c562d4515c (patch)
tree3d64c9f09c825f391cdf52ce7c1c535c1d9de820
parent3ad650a88d44bd189b1489256e872d561739e13a (diff)
- (djm) Fix memory leak on systems with BROKEN_GETADDRINFO. Based on
work by Chris Vaughan <vaughan99@yahoo.com>
-rw-r--r--ChangeLog4
-rw-r--r--defines.h8
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ffcd01d7..ab8cf256c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120010104
2 - (djm) Fix memory leak on systems with BROKEN_GETADDRINFO. Based on
3 work by Chris Vaughan <vaughan99@yahoo.com>
4
120010103 520010103
2 - (bal) fixed up sshconnect.c so it was closer inline with the OpenBSD 6 - (bal) fixed up sshconnect.c so it was closer inline with the OpenBSD
3 tree (mainly positioning) 7 tree (mainly positioning)
diff --git a/defines.h b/defines.h
index 4c3941cad..45a187c19 100644
--- a/defines.h
+++ b/defines.h
@@ -348,7 +348,13 @@ struct winsize {
348 348
349#if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO) 349#if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO)
350# undef HAVE_GETADDRINFO 350# undef HAVE_GETADDRINFO
351#endif /* defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO) */ 351#endif
352#if defined(BROKEN_GETADDRINFO) && defined(HAVE_FREEADDRINFO)
353# undef HAVE_FREEADDRINFO
354#endif
355#if defined(BROKEN_GETADDRINFO) && defined(HAVE_GAI_STRERROR)
356# undef HAVE_GAI_STRERROR
357#endif
352 358
353#if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) 359#if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY)
354# define memmove(s1, s2, n) bcopy((s2), (s1), (n)) 360# define memmove(s1, s2, n) bcopy((s2), (s1), (n))