diff options
author | markm <markm@FreeBSD.org> | 2000-02-24 15:29:42 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2000-02-24 15:29:42 +0000 |
commit | 37a38e66382c3a9fd9158a61cb6e2745d86c5df2 (patch) | |
tree | 6f147953be20d6ad5713e22b83313cbb39066181 /crypto/openssh/includes.h | |
parent | 606d31b1ec502ee62ab4644dfa593b00666d18f7 (diff) | |
download | FreeBSD-src-37a38e66382c3a9fd9158a61cb6e2745d86c5df2.zip FreeBSD-src-37a38e66382c3a9fd9158a61cb6e2745d86c5df2.tar.gz |
Add the patches fom ports (QV: ports/security/openssh/patches/patch-*)
Diffstat (limited to 'crypto/openssh/includes.h')
-rw-r--r-- | crypto/openssh/includes.h | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h index 68690e3..a20318c 100644 --- a/crypto/openssh/includes.h +++ b/crypto/openssh/includes.h @@ -11,6 +11,7 @@ * * This file includes most of the needed system headers. * + * $FreeBSD$ */ #ifndef INCLUDES_H @@ -24,12 +25,12 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #include <sys/select.h> #include <sys/param.h> #include <sys/ioctl.h> -#include <sys/endian.h> #include <sys/stat.h> #include <sys/wait.h> #include <sys/time.h> #include <sys/un.h> #include <sys/resource.h> +#include <machine/endian.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -38,7 +39,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #include <arpa/inet.h> #include <netdb.h> -#include <netgroup.h> #include <stdio.h> #include <ctype.h> #include <errno.h> @@ -66,4 +66,29 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } */ #define USE_PIPES 1 +#if defined(__FreeBSD__) && __FreeBSD__ <= 3 +/* + * Data types. + */ +typedef u_char sa_family_t; +typedef u_int32_t socklen_t; + +/* + * bsd-api-new-02a: protocol-independent placeholder for socket addresses + */ +#define _SS_MAXSIZE 128 +#define _SS_ALIGNSIZE (sizeof(int64_t)) +#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(u_char) * 2) +#define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(u_char) * 2 - \ + _SS_PAD1SIZE - _SS_ALIGNSIZE) + +struct sockaddr_storage { + u_char ss_len; /* address length */ + sa_family_t ss_family; /* address family */ + char __ss_pad1[_SS_PAD1SIZE]; + int64_t __ss_align; /* force desired structure storage alignment */ + char __ss_pad2[_SS_PAD2SIZE]; +}; +#endif + #endif /* INCLUDES_H */ |