diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20040310 | ||
2 | - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #812: #undef getaddrinfo | ||
3 | before redefining it, silences warnings on Tru64. | ||
4 | |||
1 | 20040308 | 5 | 20040308 |
2 | - (dtucker) [sshd.c] Back out rev 1.270 as it caused problems on some | 6 | - (dtucker) [sshd.c] Back out rev 1.270 as it caused problems on some |
3 | platforms (eg SCO, HP-UX) with logging in the wrong TZ. ok djm@ | 7 | platforms (eg SCO, HP-UX) with logging in the wrong TZ. ok djm@ |
@@ -891,4 +895,4 @@ | |||
891 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 895 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
892 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 896 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
893 | 897 | ||
894 | $Id: ChangeLog,v 1.3286 2004/03/08 20:12:18 tim Exp $ | 898 | $Id: ChangeLog,v 1.3287 2004/03/10 10:06:32 dtucker Exp $ |
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index eb88605fa..baea07038 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */ | 1 | /* $Id: fake-rfc2553.h,v 1.9 2004/03/10 10:06:33 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. | 4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. |
@@ -133,6 +133,9 @@ struct addrinfo { | |||
133 | #endif /* !HAVE_STRUCT_ADDRINFO */ | 133 | #endif /* !HAVE_STRUCT_ADDRINFO */ |
134 | 134 | ||
135 | #ifndef HAVE_GETADDRINFO | 135 | #ifndef HAVE_GETADDRINFO |
136 | #ifdef getaddrinfo | ||
137 | # undef getaddrinfo | ||
138 | #endif | ||
136 | #define getaddrinfo(a,b,c,d) (ssh_getaddrinfo(a,b,c,d)) | 139 | #define getaddrinfo(a,b,c,d) (ssh_getaddrinfo(a,b,c,d)) |
137 | int getaddrinfo(const char *, const char *, | 140 | int getaddrinfo(const char *, const char *, |
138 | const struct addrinfo *, struct addrinfo **); | 141 | const struct addrinfo *, struct addrinfo **); |