From: Timo Sirainen <tss@iki.fi>
Date: Mon, 26 Sep 2011 21:12:49 +0000 (+0300)
Subject: Compile fix for Solaris.
X-Git-Tag: 2.1.beta1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28aa68ccbabfcb3faf7fded0a76dc8324b695dbe;p=thirdparty%2Fdovecot%2Fcore.git

Compile fix for Solaris.
---

diff --git a/src/lib/network.c b/src/lib/network.c
index 26f0911594..90d5201308 100644
--- a/src/lib/network.c
+++ b/src/lib/network.c
@@ -27,7 +27,7 @@ union sockaddr_union {
 
 union sockaddr_union_unix {
 	struct sockaddr sa;
-	struct sockaddr_un sun;
+	struct sockaddr_un un;
 };
 
 #ifdef HAVE_IPV6
@@ -271,10 +271,7 @@ int net_try_bind(const struct ip_addr *ip)
 
 int net_connect_unix(const char *path)
 {
-	union {
-		struct sockaddr sa;
-		struct sockaddr_un un;
-	} sa;
+	union sockaddr_union_unix sa;
 	int fd, ret;
 
 	memset(&sa, 0, sizeof(sa));
@@ -687,11 +684,11 @@ int net_getunixname(int fd, const char **name_r)
 
 	if (getsockname(fd, &so.sa, &addrlen) < 0)
 		return -1;
-	if (so.sun.sun_family != AF_UNIX) {
+	if (so.un.sun_family != AF_UNIX) {
 		errno = ENOTSOCK;
 		return -1;
 	}
-	*name_r = t_strdup(so.sun.sun_path);
+	*name_r = t_strdup(so.un.sun_path);
 	return 0;
 }