summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-09 09:02:07 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-09 09:02:07 +1100
commit9eba40cec9de097b41f3f1c84799476f14260920 (patch)
tree27f6c5d87ddcf361211d18448116f9e6c2c7ab53
parent340d1688e658e85a3c45270bc3fca4e6d1aee9b1 (diff)
- (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
have it.
-rw-r--r--ChangeLog4
-rw-r--r--misc.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b1350dc35..79491f54a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120091209
2 - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
3 have it.
4
120091208 520091208
2 - (dtucker) OpenBSD CVS Sync 6 - (dtucker) OpenBSD CVS Sync
3 - andreas@cvs.openbsd.org 2009/10/24 11:11:58 7 - andreas@cvs.openbsd.org 2009/10/24 11:11:58
diff --git a/misc.c b/misc.c
index f62f8efc6..b260d89fe 100644
--- a/misc.c
+++ b/misc.c
@@ -164,9 +164,11 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
164 return (sock); 164 return (sock);
165 165
166 switch (domain) { 166 switch (domain) {
167#ifdef IPPROTO_IPV6
167 case AF_INET6: 168 case AF_INET6:
168 ipproto = IPPROTO_IPV6; 169 ipproto = IPPROTO_IPV6;
169 /* FALLTHROUGH */ 170 /* FALLTHROUGH */
171#endif
170 case AF_INET: 172 case AF_INET:
171#ifdef USE_ROUTINGDOMAIN 173#ifdef USE_ROUTINGDOMAIN
172 debug2("socket %d af %d setting rdomain %d", 174 debug2("socket %d af %d setting rdomain %d",