From: rl1987 <rl1987@sdf.lonestar.org>
Date: Sat, 3 Jun 2017 16:04:47 +0000 (+0200)
Subject: Refrain from needless SOCKS5 warning
X-Git-Tag: tor-0.3.2.1-alpha~308^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e2f78092395d1250f08a21815ab1145409530eb;p=thirdparty%2Ftor.git

Refrain from needless SOCKS5 warning
---

diff --git a/changes/bug22461 b/changes/bug22461
new file mode 100644
index 0000000000..2fb6a0223f
--- /dev/null
+++ b/changes/bug22461
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Refrain from needlessly warning Tor controller about passing
+      IP addresses as FQDNs through SOCKS5 interface. Fixes bug
+      22461, bugfix on Tor 0.2.6.2-alpha.
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 3692ed4d08..1df4be197a 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1686,8 +1686,6 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
 
           if (string_is_valid_ipv4_address(req->address) ||
               string_is_valid_ipv6_address(req->address)) {
-            log_unsafe_socks_warning(5,req->address,req->port,safe_socks);
-
             if (safe_socks) {
               socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED);
               return -1;