From 564028a07d86e7160750fb5703ab5107fa72efa8 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 26 Feb 2008 19:27:39 +0000 Subject: r14472@tombo: nickm | 2008-02-26 13:44:08 -0500 Backport trivial fix for problem that kept nameserver errors from getting reported. svn:r13741 --- ChangeLog | 1 + src/or/dns.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c841bfe4ae..5d3bc5a2d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ Changes in versino 0.1.2.20 - 2008-??-?? - We were leaking a file descriptor if Tor started with a zero-length cached-descriptors file. Patch by freddy77. - Detect size overflow in zlib code. + - Fix a pointer error that kept us from reporting nameserver errors. Changes in version 0.1.2.19 - 2008-01-17 diff --git a/src/or/dns.c b/src/or/dns.c index 977943ebe4..2a8f50efd7 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -185,7 +185,7 @@ evdns_log_cb(int warn, const char *msg) } if (!strcmpstart(msg, "Nameserver ") && (cp=strstr(msg, " has failed: "))) { char *ns = tor_strndup(msg+11, cp-(msg+11)); - const char *err = strchr(cp, ':'+2); + const char *err = strchr(cp, ':')+2; /* Don't warn about a single failed nameserver; we'll warn with 'all * nameservers have failed' if we're completely out of nameservers; * otherwise, the situation is tolerable. */ -- cgit v1.2.3-54-g00ecf