From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 3 Oct 2012 00:15:39 +0000 (-0400)
Subject: Fix compilation error left over from 1cbf45bed1. (Bug 7021)
X-Git-Tag: tor-0.2.4.4-alpha~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78e8eb5f2dfd1c811da5a6d522540dfe32ac3cb1;p=thirdparty%2Ftor.git

Fix compilation error left over from 1cbf45bed1. (Bug 7021)
---

diff --git a/src/or/dns.c b/src/or/dns.c
index 78893bfbed..4c9114c198 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1210,15 +1210,11 @@ configure_nameservers(int force)
   }
 
 #ifdef HAVE_EVDNS_SET_DEFAULT_OUTGOING_BIND_ADDRESS
-  if (options->OutboundBindAddress) {
-    tor_addr_t addr;
-    if (tor_addr_parse(&addr, options->OutboundBindAddress) < 0) {
-      log_warn(LD_CONFIG,"Outbound bind address '%s' didn't parse. Ignoring.",
-               options->OutboundBindAddress);
-    } else {
+  if (! tor_addr_is_null(options->_OutboundBindAddressIPv4)) {
+    if (1) {
       int socklen;
       struct sockaddr_storage ss;
-      socklen = tor_addr_to_sockaddr(&addr, 0,
+      socklen = tor_addr_to_sockaddr(&options->_OutboundBindAddressIPv4, 0,
                                      (struct sockaddr *)&ss, sizeof(ss));
       if (socklen <= 0) {
         log_warn(LD_BUG, "Couldn't convert outbound bind address to sockaddr."