Commit 3b302cbab9afea6481704fdfd6e5ab08f7f0dc27

Con Kolivas 2013-09-10T07:06:32

Merge branch 'master' into quota

1
2
3
4
5
6
7
8
9
10
11
12
13
14
diff --git a/util.c b/util.c
index fc488a4..02ea133 100644
--- a/util.c
+++ b/util.c
@@ -1867,7 +1867,8 @@ static bool socks4_negotiate(struct pool *pool, int sockd, bool socks4a)
 
 	/* See if we've been given an IP address directly to avoid needing to
 	 * resolve it. */
-	inp = inet_network(pool->sockaddr_url);
+	inp = inet_addr(pool->sockaddr_url);
+	inp = ntohl(inp);
 	if ((int)inp != -1)
 		socks4a = false;
 	else {