diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | fake-socket.h | 12 |
2 files changed, 6 insertions, 8 deletions
@@ -1,4 +1,6 @@ | |||
1 | 20000916 | 1 | 20000916 |
2 | - (djm) Use a real struct sockaddr inside the fake struct sockaddr_storage. | ||
3 | Patch from Larry Jones <larry.jones@sdrc.com> | ||
2 | - (djm) Add Steve VanDevender's <stevev@darkwing.uoregon.edu> PAM | 4 | - (djm) Add Steve VanDevender's <stevev@darkwing.uoregon.edu> PAM |
3 | password change patch. | 5 | password change patch. |
4 | - (djm) Bring licenses on my stuff in line with OpenBSD's | 6 | - (djm) Bring licenses on my stuff in line with OpenBSD's |
diff --git a/fake-socket.h b/fake-socket.h index 0e1624d11..b51caa030 100644 --- a/fake-socket.h +++ b/fake-socket.h | |||
@@ -6,17 +6,13 @@ | |||
6 | 6 | ||
7 | #ifndef HAVE_STRUCT_SOCKADDR_STORAGE | 7 | #ifndef HAVE_STRUCT_SOCKADDR_STORAGE |
8 | # define _SS_MAXSIZE 128 /* Implementation specific max size */ | 8 | # define _SS_MAXSIZE 128 /* Implementation specific max size */ |
9 | # define _SS_ALIGNSIZE (sizeof(int)) | 9 | # define _SS_PADSIZE (_SS_MAXSIZE - sizeof (struct sockaddr)) |
10 | # define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(u_short)) | ||
11 | # define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof(u_short) + \ | ||
12 | _SS_PAD1SIZE + _SS_ALIGNSIZE)) | ||
13 | 10 | ||
14 | struct sockaddr_storage { | 11 | struct sockaddr_storage { |
15 | u_short ss_family; | 12 | struct sockaddr ss_sa; |
16 | char __ss_pad1[_SS_PAD1SIZE]; | 13 | char __ss_pad2[_SS_PADSIZE]; |
17 | int __ss_align; | ||
18 | char __ss_pad2[_SS_PAD2SIZE]; | ||
19 | }; | 14 | }; |
15 | # define ss_family ss_sa.sa_family | ||
20 | #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */ | 16 | #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */ |
21 | 17 | ||
22 | #ifndef IN6_IS_ADDR_LOOPBACK | 18 | #ifndef IN6_IS_ADDR_LOOPBACK |