Mercurial > dropbear
diff includes.h @ 511:582cb38e4eb5 insecure-nocrypto
propagate from branch 'au.asn.ucc.matt.dropbear' (head cdcc3c729e29544e8b98a408e2dc60e4483dfd2a)
to branch 'au.asn.ucc.matt.dropbear.insecure-nocrypto' (head 0ca38a1cf349f7426ac9de34ebe4c3e3735effab)
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 06 Nov 2008 13:16:55 +0000 |
| parents | 7e43f5e473b9 |
| children | d194db6f9453 76097ec1a29a |
line wrap: on
line diff
--- a/includes.h Mon Oct 02 06:40:51 2006 +0000 +++ b/includes.h Thu Nov 06 13:16:55 2008 +0000 @@ -38,6 +38,7 @@ #include <sys/time.h> #include <sys/un.h> #include <sys/wait.h> +#include <sys/resource.h> #include <stdio.h> #include <errno.h> @@ -55,6 +56,7 @@ #include <ctype.h> #include <stdarg.h> #include <dirent.h> +#include <time.h> #ifdef HAVE_UTMP_H #include <utmp.h> @@ -72,12 +74,12 @@ #include <lastlog.h> #endif -#include <arpa/inet.h> - #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include <arpa/inet.h> + /* netbsd 1.6 needs this to be included before netinet/ip.h for some * undocumented reason */ #ifdef HAVE_NETINET_IN_SYSTM_H @@ -135,13 +137,6 @@ #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__)