From c894ea4ea2ed07cb939fde4f6d3ab4561016f986 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Thu, 10 Nov 2011 18:17:00 +0800
Subject: [PATCH] Put better #if guards around IPv6 socket options for
 IPV6_TCLASS and IPV6_V6ONLY. From Gustavo Zacarias.

---
 dbutil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dbutil.c b/dbutil.c
index 39804ce5..8823ab60 100644
--- a/dbutil.c
+++ b/dbutil.c
@@ -164,7 +164,7 @@ static void set_sock_priority(int sock) {
 	/* set the TOS bit for either ipv4 or ipv6 */
 #ifdef IPTOS_LOWDELAY
 	val = IPTOS_LOWDELAY;
-#ifdef IPPROTO_IPV6
+#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)
 	setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&val, sizeof(val));
 #endif
 	setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val));
@@ -256,7 +256,7 @@ int dropbear_listen(const char* address, const char* port,
 		linger.l_linger = 5;
 		setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&linger, sizeof(linger));
 
-#ifdef IPV6_V6ONLY
+#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
 		if (res->ai_family == AF_INET6) {
 			int on = 1;
 			if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, 
-- 
GitLab