From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 1 Feb 2018 15:43:00 +0000 (+0000)
Subject: auth zone socket creation fix.
X-Git-Tag: release-1.7.0rc1~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc9a0671f33fea48d5344adbd808cbfc707c6d01;p=thirdparty%2Funbound.git

auth zone socket creation fix.


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

diff --git a/services/outside_network.c b/services/outside_network.c
index bda2fa12e..bdb48ad60 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -262,6 +262,7 @@ outnet_tcp_connect(int s, struct sockaddr_storage* addr, socklen_t addrlen)
 				log_err_addr("outgoing tcp: connect",
 					strerror(errno), addr, addrlen);
 			close(s);
+			return 0;
 #ifdef EINPROGRESS
 		}
 #endif
@@ -269,9 +270,9 @@ outnet_tcp_connect(int s, struct sockaddr_storage* addr, socklen_t addrlen)
 		if(WSAGetLastError() != WSAEINPROGRESS &&
 			WSAGetLastError() != WSAEWOULDBLOCK) {
 			closesocket(s);
+			return 0;
 		}
 #endif
-		return 0;
 	}
 	return 1;
 }
@@ -2190,7 +2191,7 @@ fd_for_dest(struct outside_network* outnet, struct sockaddr_storage* to_addr,
 			struct sockaddr_in* sa = (struct sockaddr_in*)addr;
 			sa->sin_port = (in_port_t)htons((uint16_t)port);
 			fd = create_udp_sock(AF_INET, SOCK_DGRAM, 
-				(struct sockaddr*)&sa, addrlen, 1, &inuse, &noproto,
+				(struct sockaddr*)addr, addrlen, 1, &inuse, &noproto,
 				0, 0, 0, NULL, 0, freebind, 0);
 		}
 		if(fd != -1) {