summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-14 13:46:10 -0400
committerNick Mathewson <nickm@torproject.org>2011-06-14 13:46:10 -0400
commita25c0a5bf81768c4d4f6fe377cea48f47333a8c8 (patch)
tree73e9c40d91329c1a0004ff89ca445c7014d3c3e1
parente70e8367c9bb3ff04645454e9dfe694ac6762dc3 (diff)
parente470f6a8866105c9f6b113aa8eafec5ee202c992 (diff)
downloadtor-a25c0a5bf81768c4d4f6fe377cea48f47333a8c8.tar.gz
tor-a25c0a5bf81768c4d4f6fe377cea48f47333a8c8.zip
Merge remote-tracking branch 'public/bug3369' into maint-0.2.2
-rw-r--r--changes/bug33694
-rw-r--r--src/or/dnsserv.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug3369 b/changes/bug3369
new file mode 100644
index 0000000000..9c0d0e699a
--- /dev/null
+++ b/changes/bug3369
@@ -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.
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 009ab5f344..f2c473dfc5 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -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) {