2000-01-13 23:22:17 +00:00
|
|
|
--- /usr/ports/distfiles/OpenSSH-1.2.1/src/usr.bin/ssh/includes.h Sun Nov 28 16:37:35 1999
|
|
|
|
|
+++ includes.h Thu Jan 13 18:03:48 2000
|
1999-11-24 03:36:23 +00:00
|
|
|
@@ -24,12 +24,12 @@
|
|
|
|
|
#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>
|
1999-11-20 06:59:57 +00:00
|
|
|
|
1999-11-24 03:36:23 +00:00
|
|
|
#include <netinet/in.h>
|
|
|
|
|
#include <netinet/in_systm.h>
|
|
|
|
|
@@ -38,7 +38,6 @@
|
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
|
#include <netdb.h>
|
|
|
|
|
|
|
|
|
|
-#include <netgroup.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <errno.h>
|
2000-01-13 23:22:17 +00:00
|
|
|
@@ -65,5 +64,33 @@
|
|
|
|
|
* client program. Socketpairs do not seem to work on all systems.
|
|
|
|
|
*/
|
|
|
|
|
#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];
|
|
|
|
|
+};
|
|
|
|
|
+#else
|
|
|
|
|
+#define ss_len __ss_len
|
|
|
|
|
+#define ss_family __ss_family
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
#endif /* INCLUDES_H */
|
