diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2010-07-21 13:53:23 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2010-07-21 13:53:23 +0000 |
| commit | aabe0677c006d3832cee8a9e9e4c1c170b4c17d3 (patch) | |
| tree | 2b109090060332611432c7969c72d7ca044e0e5e /fake-rfc2553.h | |
| parent | 27fddd2c355b32c5bc304a026f3ceae86433c34c (diff) | |
- Update fake-rfc2553.{c,h} from OpenSSH 5.5p1
--HG--
extra : convert_revision : 4b90e96a8a8afcc9feafc59cb47592a4a6d1cc30
Diffstat (limited to 'fake-rfc2553.h')
| -rw-r--r-- | fake-rfc2553.h | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/fake-rfc2553.h b/fake-rfc2553.h index 053e6a6..876fa14 100644 --- a/fake-rfc2553.h +++ b/fake-rfc2553.h @@ -1,6 +1,6 @@ -/* Taken from OpenSSH 3.8.1p1 */ +/* Taken for Dropbear from OpenSSH 5.5p1 */ -/* $.Id: fake-rfc2553.h,v 1.9 2004/03/10 10:06:33 dtucker Exp $ */ +/* $Id: fake-rfc2553.h,v 1.16 2008/07/14 11:37:37 djm Exp $ */ /* * Copyright (C) 2000-2003 Damien Miller. All rights reserved. @@ -43,6 +43,10 @@ #define _FAKE_RFC2553_H #include "includes.h" +#include <sys/types.h> +#if defined(HAVE_NETDB_H) +# include <netdb.h> +#endif /* * First, socket and INET6 related definitions @@ -75,6 +79,7 @@ struct sockaddr_in6 { u_int16_t sin6_port; u_int32_t sin6_flowinfo; struct in6_addr sin6_addr; + u_int32_t sin6_scope_id; }; #endif /* !HAVE_STRUCT_SOCKADDR_IN6 */ @@ -115,9 +120,19 @@ struct sockaddr_in6 { #endif /* !NI_MAXHOST */ #ifndef EAI_NODATA -# define EAI_NODATA 1 -# define EAI_MEMORY 2 -# define EAI_NONAME 3 +# define EAI_NODATA (INT_MAX - 1) +#endif +#ifndef EAI_MEMORY +# define EAI_MEMORY (INT_MAX - 2) +#endif +#ifndef EAI_NONAME +# define EAI_NONAME (INT_MAX - 3) +#endif +#ifndef EAI_SYSTEM +# define EAI_SYSTEM (INT_MAX - 4) +#endif +#ifndef EAI_FAMILY +# define EAI_FAMILY (INT_MAX - 5) #endif #ifndef HAVE_STRUCT_ADDRINFO @@ -143,7 +158,7 @@ int getaddrinfo(const char *, const char *, #endif /* !HAVE_GETADDRINFO */ #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO) -#define gai_strerror(a) (ssh_gai_strerror(a)) +#define gai_strerror(a) (_ssh_compat_gai_strerror(a)) char *gai_strerror(int); #endif /* !HAVE_GAI_STRERROR */ |