From: Vladimir Kotal <vladimir.kotal@oracle.com>
Date: Wed, 4 Oct 2023 14:11:42 +0000 (+0200)
Subject: avoid sun as variable name
X-Git-Tag: openssl-3.2.0-beta1~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ae31586a77c09d45838fff73b589b2958fbd18b;p=thirdparty%2Fopenssl.git

avoid sun as variable name

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22281)
---

diff --git a/test/bio_addr_test.c b/test/bio_addr_test.c
index a985d03b14c..9ca007e5119 100644
--- a/test/bio_addr_test.c
+++ b/test/bio_addr_test.c
@@ -31,7 +31,7 @@ static BIO_ADDR *make_dummy_addr(int family)
         struct sockaddr_in6 sin6;
 #endif
 #ifndef OPENSSL_NO_UNIX_SOCK
-        struct sockaddr_un sun;
+        struct sockaddr_un sunaddr;
 #endif
     } sa;
     void *where;
@@ -51,9 +51,9 @@ static BIO_ADDR *make_dummy_addr(int family)
 #endif
 #ifndef OPENSSL_NO_UNIX_SOCK
     case AF_UNIX:
-        where = &(sa.sun.sun_path);
+        where = &(sa.sunaddr.sun_path);
         /* BIO_ADDR_rawmake needs an extra byte for a NUL-terminator*/
-        wherelen = sizeof(sa.sun.sun_path) - 1;
+        wherelen = sizeof(sa.sunaddr.sun_path) - 1;
         break;
 #endif
     default: