[tor-commits] [tor/master] Fix compilation with libevent 1

[nickm@xxxxxxxxxxxxxx]

commit ee01e41937947eb77c02f552d59090c0ea280f98
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Sep 19 20:25:05 2013 -0400

    Fix compilation with libevent 1
    
    a9910d89 added trickery to make us work with interned strings and
    seccomp; it requires libevent 2.
    
    Fix for 9785; bug not in any released tor.
---
 src/or/dns.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/or/dns.c b/src/or/dns.c
index 62ee4f3..a1fe0de 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1493,11 +1493,13 @@ configure_nameservers(int force)
       evdns_base_search_clear(the_evdns_base);
       evdns_base_clear_nameservers_and_suspend(the_evdns_base);
     }
+#if defined(DNS_OPTION_HOSTSFILE) && defined(USE_LIBSECCOMP)
     if (flags & DNS_OPTION_HOSTSFILE) {
       flags ^= DNS_OPTION_HOSTSFILE;
       evdns_base_load_hosts(the_evdns_base,
-          sandbox_intern_string("/etc/resolv.conf"));
+          sandbox_intern_string("/etc/hosts"));
     }
+#endif
     log_info(LD_EXIT, "Parsing resolver configuration in '%s'", conf_fname);
     if ((r = evdns_base_resolv_conf_parse(the_evdns_base, flags,
         sandbox_intern_string(conf_fname)))) {

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits