# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1466517870 -28800
# Node ID e742c0e9b941ed086b91108548cc4ada96c88086
# Parent  251c5f7a6e96c0b7770d9592013c2d31600b2496# Parent  4fb9261ef02a91b5831323462a12dbe6993e48d2
merge

diff -r 4fb9261ef02a -r e742c0e9b941 netio.c
--- a/netio.c	Thu May 12 23:47:35 2016 +0800
+++ b/netio.c	Tue Jun 21 22:04:30 2016 +0800
@@ -61,7 +61,7 @@
 	{
 		dropbear_assert(c->sock == -1);
 
-		c->sock = socket(c->res_iter->ai_family, c->res_iter->ai_socktype, c->res_iter->ai_protocol);
+		c->sock = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
 		if (c->sock < 0) {
 			continue;
 		}