Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-06-14 13:46:46 -04:00
commit 875a551409
3 changed files with 11 additions and 2 deletions

4
changes/bug3369 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- When asked about a DNS record type we don't support via a
client DNSPort, reply with NOTIMPL rather than an empty
reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha.

5
changes/bug3393 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Fix a bug when using ControlSocketsGroupWritable with User. The
directory's group would be checked against the current group, not
the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix
on Tor 0.2.2.26-beta.

View File

@ -95,8 +95,8 @@ evdns_server_callback(struct evdns_server_request *req, void *_data)
}
if (!q) {
log_info(LD_APP, "None of the questions we got were ones we're willing "
"to support. Sending NODATA.");
evdns_server_request_respond(req, DNS_ERR_NONE);
"to support. Sending NOTIMPL.");
evdns_server_request_respond(req, DNS_ERR_NOTIMPL);
return;
}
if (q->type != EVDNS_TYPE_A) {