From: dtucker <dtucker>
Date: Fri, 8 Jan 2010 22:02:07 +0000 (+0000)
Subject:  - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/17073b5e65f53e29a8d75e879fe68e6c8212714b?hp=d03186af8de9b660564ccc1804d2a9c2e93b2e58

 - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
   have it.
---

diff --git a/ChangeLog b/ChangeLog
index b1350dc3..79491f54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20091209
+ - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
+   have it.
+
 20091208
  - (dtucker) OpenBSD CVS Sync
    - andreas@cvs.openbsd.org 2009/10/24 11:11:58
diff --git a/misc.c b/misc.c
index f62f8efc..b260d89f 100644
--- a/misc.c
+++ b/misc.c
@@ -164,9 +164,11 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
 		return (sock);
 
 	switch (domain) {
+#ifdef IPPROTO_IPV6
 	case AF_INET6:
 		ipproto = IPPROTO_IPV6;
 		/* FALLTHROUGH */
+#endif
 	case AF_INET:
 #ifdef USE_ROUTINGDOMAIN
 		debug2("socket %d af %d setting rdomain %d",