diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-07 10:37:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-07 10:37:53 -0500 |
| commit | f2a30413a35bb360323a98fb124fbc629245978d (patch) | |
| tree | 07a38f440cef4ff64966da5f8edabc938e0c8311 /src/or/dnsserv.c | |
| parent | 5446cb8d3d536e9bc737de6d9286bd4b4b185661 (diff) | |
| parent | 2ce43302490ac916be4188bff70f70958aee1790 (diff) | |
| download | tor-f2a30413a35bb360323a98fb124fbc629245978d.tar.gz tor-f2a30413a35bb360323a98fb124fbc629245978d.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'src/or/dnsserv.c')
| -rw-r--r-- | src/or/dnsserv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index f7710908bd..f3618cc2c5 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -87,8 +87,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: @@ -96,7 +94,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; |