diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -5,6 +5,8 @@ | |||
5 | - (dtucker) [LICENCE Makefile.in auth-passwd.c auth-shadow.c auth.c auth.h | 5 | - (dtucker) [LICENCE Makefile.in auth-passwd.c auth-shadow.c auth.c auth.h |
6 | defines.h] Bug #14: Use do_pwchange to support password expiry and force | 6 | defines.h] Bug #14: Use do_pwchange to support password expiry and force |
7 | change for platforms using /etc/shadow. ok djm@ | 7 | change for platforms using /etc/shadow. ok djm@ |
8 | - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #563: Prepend ssh_ to compat | ||
9 | functions to avoid conflicts with Heimdal's libroken. ok djm@ | ||
8 | 10 | ||
9 | 20040207 | 11 | 20040207 |
10 | - (dtucker) OpenBSD CVS Sync | 12 | - (dtucker) OpenBSD CVS Sync |
@@ -1828,4 +1830,4 @@ | |||
1828 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1830 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1829 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1831 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1830 | 1832 | ||
1831 | $Id: ChangeLog,v 1.3219 2004/02/10 02:01:14 dtucker Exp $ | 1833 | $Id: ChangeLog,v 1.3220 2004/02/10 02:05:40 dtucker Exp $ |
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index bf727ceac..eb88605fa 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fake-rfc2553.h,v 1.7 2003/09/22 02:08:23 dtucker Exp $ */ | 1 | /* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 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,19 +133,23 @@ struct addrinfo { | |||
133 | #endif /* !HAVE_STRUCT_ADDRINFO */ | 133 | #endif /* !HAVE_STRUCT_ADDRINFO */ |
134 | 134 | ||
135 | #ifndef HAVE_GETADDRINFO | 135 | #ifndef HAVE_GETADDRINFO |
136 | #define getaddrinfo(a,b,c,d) (ssh_getaddrinfo(a,b,c,d)) | ||
136 | int getaddrinfo(const char *, const char *, | 137 | int getaddrinfo(const char *, const char *, |
137 | const struct addrinfo *, struct addrinfo **); | 138 | const struct addrinfo *, struct addrinfo **); |
138 | #endif /* !HAVE_GETADDRINFO */ | 139 | #endif /* !HAVE_GETADDRINFO */ |
139 | 140 | ||
140 | #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO) | 141 | #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO) |
142 | #define gai_strerror(a) (ssh_gai_strerror(a)) | ||
141 | char *gai_strerror(int); | 143 | char *gai_strerror(int); |
142 | #endif /* !HAVE_GAI_STRERROR */ | 144 | #endif /* !HAVE_GAI_STRERROR */ |
143 | 145 | ||
144 | #ifndef HAVE_FREEADDRINFO | 146 | #ifndef HAVE_FREEADDRINFO |
147 | #define freeaddrinfo(a) (ssh_freeaddrinfo(a)) | ||
145 | void freeaddrinfo(struct addrinfo *); | 148 | void freeaddrinfo(struct addrinfo *); |
146 | #endif /* !HAVE_FREEADDRINFO */ | 149 | #endif /* !HAVE_FREEADDRINFO */ |
147 | 150 | ||
148 | #ifndef HAVE_GETNAMEINFO | 151 | #ifndef HAVE_GETNAMEINFO |
152 | #define getnameinfo(a,b,c,d,e,f,g) (ssh_getnameinfo(a,b,c,d,e,f,g)) | ||
149 | int getnameinfo(const struct sockaddr *, size_t, char *, size_t, | 153 | int getnameinfo(const struct sockaddr *, size_t, char *, size_t, |
150 | char *, size_t, int); | 154 | char *, size_t, int); |
151 | #endif /* !HAVE_GETNAMEINFO */ | 155 | #endif /* !HAVE_GETNAMEINFO */ |