summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-02-22 20:33:47 +0000
committerNick Mathewson <nickm@torproject.org>2008-02-22 20:33:47 +0000
commit7589765ae94291f1bc6ed9c7bd4dd24b7c9b9f09 (patch)
tree277e056c0ef85b4b816847c725301cbd82ba4ca7
parente7db789e82a7a2edc5c7e8230265f8ec83021f69 (diff)
downloadtor-7589765ae94291f1bc6ed9c7bd4dd24b7c9b9f09.tar.gz
tor-7589765ae94291f1bc6ed9c7bd4dd24b7c9b9f09.zip
r14401@tombo: nickm | 2008-02-22 15:33:42 -0500
Fix a really stupid parthensis error noticed by mwenge. svn:r13681
-rw-r--r--ChangeLog2
-rw-r--r--src/or/dns.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a7cf4ece0..c776db92e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,8 @@ Changes in version 0.2.0.20-?? - 2008-02-??
as a "close". Stop calling closes "unexpected closes": existing
Tors don't use SSL_close(), so having a connection close without
the TLS shutdown handshake is hardly unexpected.
+ - Send NAMESERVER_STATUS messages for a single failed nameserver
+ correctly.
o Code simplifications and refactoring:
- Remove the tor_strpartition function: its logic was confused,
diff --git a/src/or/dns.c b/src/or/dns.c
index a617130bdf..bb932450f5 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -156,7 +156,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;
tor_assert(err);
/* Don't warn about a single failed nameserver; we'll warn with 'all
* nameservers have failed' if we're completely out of nameservers;