aboutsummaryrefslogtreecommitdiff
path: root/src/or/dnsserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-04 14:47:04 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-04 14:47:04 -0400
commit31332a878db0d8f8d53fe4e535ec9ae812675315 (patch)
tree91e823807e5cb7a650a96d05aa785d1d18dd9d6e /src/or/dnsserv.c
parent8f292f1c33b033f36e17969f206c9332c0241e9a (diff)
parent0ca3f495c6fad074606ab75942b64738ed61926a (diff)
downloadtor-31332a878db0d8f8d53fe4e535ec9ae812675315.tar.gz
tor-31332a878db0d8f8d53fe4e535ec9ae812675315.zip
Merge branch 'bug18710_025' into maint-0.2.8
Diffstat (limited to 'src/or/dnsserv.c')
-rw-r--r--src/or/dnsserv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 8ddb414fe5..74f17ce78c 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -88,8 +88,6 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
for (i = 0; i < req->nquestions; ++i) {
if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET)
continue;
- if (! q)
- q = req->questions[i];
switch (req->questions[i]->type) {
case EVDNS_TYPE_A:
case EVDNS_TYPE_AAAA:
@@ -97,7 +95,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
/* We always pick the first one of these questions, if there is
one. */
if (! supported_q)
- supported_q = q;
+ supported_q = req->questions[i];
break;
default:
break;