diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-06-10 23:52:51 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-10 23:52:51 +1000 |
commit | 9d3739daa1f716fcd4c55d551cb4c22acdf6f8e0 (patch) | |
tree | 13b8c40184b778e16772e4aa2506e08b59f402f2 | |
parent | 10f9242b86bc570638b5c0e985e4f4b98c1dd073 (diff) |
- (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6
since the new CIDR code in addmatch.c references it.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -32,6 +32,8 @@ | |||
32 | - dtucker@cvs.openbsd.org 2008/06/10 05:23:32 | 32 | - dtucker@cvs.openbsd.org 2008/06/10 05:23:32 |
33 | [regress/addrmatch.sh regress/Makefile] | 33 | [regress/addrmatch.sh regress/Makefile] |
34 | Regress test for Match CIDR rules. ok djm@ | 34 | Regress test for Match CIDR rules. ok djm@ |
35 | - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6 | ||
36 | since the new CIDR code in addmatch.c references it. | ||
35 | 37 | ||
36 | 20080609 | 38 | 20080609 |
37 | - (dtucker) OpenBSD CVS Sync | 39 | - (dtucker) OpenBSD CVS Sync |
@@ -4118,4 +4120,4 @@ | |||
4118 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4120 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4119 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4121 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4120 | 4122 | ||
4121 | $Id: ChangeLog,v 1.4955 2008/06/10 13:16:46 dtucker Exp $ | 4123 | $Id: ChangeLog,v 1.4956 2008/06/10 13:52:51 dtucker Exp $ |
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index ab9a2af63..13240970f 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fake-rfc2553.h,v 1.14 2008/02/25 09:21:20 dtucker Exp $ */ | 1 | /* $Id: fake-rfc2553.h,v 1.15 2008/06/10 13:52:51 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. | 4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. |
@@ -77,6 +77,7 @@ struct sockaddr_in6 { | |||
77 | u_int16_t sin6_port; | 77 | u_int16_t sin6_port; |
78 | u_int32_t sin6_flowinfo; | 78 | u_int32_t sin6_flowinfo; |
79 | struct in6_addr sin6_addr; | 79 | struct in6_addr sin6_addr; |
80 | u_int32_t sin6_scope_id; | ||
80 | }; | 81 | }; |
81 | #endif /* !HAVE_STRUCT_SOCKADDR_IN6 */ | 82 | #endif /* !HAVE_STRUCT_SOCKADDR_IN6 */ |
82 | 83 | ||