From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 23 Jan 2021 07:26:05 +0000 (+1100)
Subject: ifdef new instance of sin6_scope_id
X-Git-Tag: V_8_5_P1~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95eca1e195a3b41baa1a725c2c5af8a09d885e4b;p=thirdparty%2Fopenssh-portable.git

ifdef new instance of sin6_scope_id

Put inside HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID similar to
existing instance.  Should fix error on UnixWare 7.
---

diff --git a/addr.c b/addr.c
index d9b1927ee..ba0fad4e9 100644
--- a/addr.c
+++ b/addr.c
@@ -92,7 +92,9 @@ addr_xaddr_to_sa(const struct xaddr *xa, struct sockaddr *sa, socklen_t *len,
 		in6->sin6_family = AF_INET6;
 		in6->sin6_port = htons(port);
 		memcpy(&in6->sin6_addr, &xa->v6, sizeof(in6->sin6_addr));
+#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
 		in6->sin6_scope_id = xa->scope_id;
+#endif
 		break;
 	default:
 		return -1;