Mercurial > dropbear
diff includes.h @ 293:9d110777f345 contrib-blacklist
propagate from branch 'au.asn.ucc.matt.dropbear' (head 7ad1775ed65e75dbece27fe6b65bf1a234db386a)
to branch 'au.asn.ucc.matt.dropbear.contrib.blacklist' (head 1d86a4f0a401cc68c2670d821a2f6366c37af143)
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Fri, 10 Mar 2006 06:31:29 +0000 |
| parents | a3a68c25035e |
| children | 740e782679be e17f0333c21e 1bfa65fed772 |
line wrap: on
line diff
--- a/includes.h Tue Sep 06 04:57:14 2005 +0000 +++ b/includes.h Fri Mar 10 06:31:29 2006 +0000 @@ -44,7 +44,6 @@ #include <fcntl.h> #include <grp.h> #include <limits.h> -#include <netinet/in.h> #include <pwd.h> #include <signal.h> #include <stdlib.h> @@ -57,8 +56,6 @@ #include <stdarg.h> #include <dirent.h> -#include <arpa/inet.h> - #ifdef HAVE_UTMP_H #include <utmp.h> #endif @@ -75,10 +72,20 @@ #include <lastlog.h> #endif +#include <arpa/inet.h> + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +/* netbsd 1.6 needs this to be included before netinet/ip.h for some + * undocumented reason */ +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif + +#include <netinet/ip.h> + #ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif @@ -128,6 +135,13 @@ #define LOG_AUTHPRIV LOG_AUTH #endif +/* glibc 2.1.3 systems have sockaddr_storage.__ss_family rather than + * sockaddr_storage.ss_family */ +#if !defined(HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY) \ + && defined(HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY) +#define ss_family __ss_family +#endif + /* so we can avoid warnings about unused params (ie in signal handlers etc) */ #ifdef UNUSED #elif defined(__GNUC__)