diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2004-02-10 03:05:40 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2004-02-10 03:05:40 +0100 |
| commit | ffae5320769fab707a8f0c533e5900d5e03f5820 (patch) | |
| tree | 6ca4415adf32a30be0eb408b2200884fc8c5aff5 | |
| parent | - (dtucker) [LICENCE Makefile.in auth-passwd.c auth-shadow.c auth.c auth.h (diff) | |
| download | openssh-ffae5320769fab707a8f0c533e5900d5e03f5820.tar.xz openssh-ffae5320769fab707a8f0c533e5900d5e03f5820.zip | |
- (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #563: Prepend ssh_ to compat
functions to avoid conflicts with Heimdal's libroken. ok djm@
| -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 @@ - (dtucker) [LICENCE Makefile.in auth-passwd.c auth-shadow.c auth.c auth.h defines.h] Bug #14: Use do_pwchange to support password expiry and force change for platforms using /etc/shadow. ok djm@ + - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #563: Prepend ssh_ to compat + functions to avoid conflicts with Heimdal's libroken. ok djm@ 20040207 - (dtucker) OpenBSD CVS Sync @@ -1828,4 +1830,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3219 2004/02/10 02:01:14 dtucker Exp $ +$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 @@ -/* $Id: fake-rfc2553.h,v 1.7 2003/09/22 02:08:23 dtucker Exp $ */ +/* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */ /* * Copyright (C) 2000-2003 Damien Miller. All rights reserved. @@ -133,19 +133,23 @@ struct addrinfo { #endif /* !HAVE_STRUCT_ADDRINFO */ #ifndef HAVE_GETADDRINFO +#define getaddrinfo(a,b,c,d) (ssh_getaddrinfo(a,b,c,d)) int getaddrinfo(const char *, const char *, const struct addrinfo *, struct addrinfo **); #endif /* !HAVE_GETADDRINFO */ #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO) +#define gai_strerror(a) (ssh_gai_strerror(a)) char *gai_strerror(int); #endif /* !HAVE_GAI_STRERROR */ #ifndef HAVE_FREEADDRINFO +#define freeaddrinfo(a) (ssh_freeaddrinfo(a)) void freeaddrinfo(struct addrinfo *); #endif /* !HAVE_FREEADDRINFO */ #ifndef HAVE_GETNAMEINFO +#define getnameinfo(a,b,c,d,e,f,g) (ssh_getnameinfo(a,b,c,d,e,f,g)) int getnameinfo(const struct sockaddr *, size_t, char *, size_t, char *, size_t, int); #endif /* !HAVE_GETNAMEINFO */ |