From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 30 Jan 2015 15:34:27 +0000 (+0000)
Subject: Solaris portability fix.
X-Git-Tag: release-1.5.2rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=397cb6ff55c16de6362fe96f2049c662f4fed8bd;p=thirdparty%2Funbound.git

Solaris portability fix.


git-svn-id: file:///svn/unbound/trunk@3327 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 09dc40870..3b47d3bf8 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -204,12 +204,12 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd)
 			fatal_exit("could not parse IP@port: %s", svr);
 #ifdef HAVE_SYS_UN_H
 	} else if(svr[0] == '/') {
-		struct sockaddr_un* sun = (struct sockaddr_un *) &addr;
-		sun->sun_family = AF_LOCAL;
+		struct sockaddr_un* usock = (struct sockaddr_un *) &addr;
+		usock->sun_family = AF_LOCAL;
 #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
-		sun->sun_len = (socklen_t)sizeof(sun);
+		usock->sun_len = (socklen_t)sizeof(usock);
 #endif
-		(void)strlcpy(sun->sun_path, svr, sizeof(sun->sun_path));
+		(void)strlcpy(usock->sun_path, svr, sizeof(usock->sun_path));
 		addrlen = (socklen_t)sizeof(struct sockaddr_un);
 		addrfamily = AF_LOCAL;
 #endif