diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-26 13:10:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-26 13:10:54 -0400 |
| commit | b75d1daf40c0d104b8224df337949753a5e65e74 (patch) | |
| tree | 6804a9a1df747305dc0e5011445dad38b8188496 /src/or/dnsserv.c | |
| parent | bb6d45af1fc738b9f71e798cde6c7564172b6e04 (diff) | |
| parent | 6a829a340477a117d2e7cacc44688988d4b5be41 (diff) | |
| download | tor-b75d1daf40c0d104b8224df337949753a5e65e74.tar.gz tor-b75d1daf40c0d104b8224df337949753a5e65e74.zip | |
Merge remote-tracking branch 'public/bug2332' into maint-0.2.2
Diffstat (limited to 'src/or/dnsserv.c')
| -rw-r--r-- | src/or/dnsserv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index f7a8d35f78..243b730cbf 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -280,7 +280,7 @@ dnsserv_resolved(edge_connection_t *conn, conn->socks_request->command == SOCKS_COMMAND_RESOLVE) { evdns_server_request_add_a_reply(req, name, - 1, (char*)answer, ttl); + 1, answer, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256 && conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { |