[tor-commits] [tor/master] Fix compilation error left over from 1cbf45bed1. (Bug 7021)

[arma at torproject.org]

commit 78e8eb5f2dfd1c811da5a6d522540dfe32ac3cb1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 2 20:15:39 2012 -0400

    Fix compilation error left over from 1cbf45bed1. (Bug 7021)
---
 src/or/dns.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/or/dns.c b/src/or/dns.c
index 78893bf..4c9114c 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."