From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Date: Thu, 9 Nov 2017 15:52:12 +0000 (-0500)
Subject: lib: fix illumos build issue
X-Git-Tag: 2.2.34~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dcef125112096389982e380dd993a5e04d62aff;p=thirdparty%2Fdovecot%2Fcore.git

lib: fix illumos build issue

The recent performance improvements to the net_addr2ip() code broke
build on illumos which has a 's_addr' #define in netinit/in.h.
---

diff --git a/src/lib/net.c b/src/lib/net.c
index 08e3081ac1..2f58d84561 100644
--- a/src/lib/net.c
+++ b/src/lib/net.c
@@ -954,7 +954,7 @@ const char *net_ip2addr(const struct ip_addr *ip)
 
 static bool net_addr2ip_inet4_fast(const char *addr, struct ip_addr *ip)
 {
-	uint8_t *s_addr = (void *)&ip->u.ip4.s_addr;
+	uint8_t *saddr = (void *)&ip->u.ip4.s_addr;
 	unsigned int i, num;
 
 	if (str_parse_uint(addr, &num, &addr) < 0)
@@ -971,7 +971,7 @@ static bool net_addr2ip_inet4_fast(const char *addr, struct ip_addr *ip)
 	for (;;) {
 		if (num >= 256)
 			return FALSE;
-		s_addr[i] = num;
+		saddr[i] = num;
 		if (i == 3)
 			break;
 		i++;