[or-cvs] r13741: Backport trivial fix for problem that kept nameserver errors (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-02-26 14:27:39 -0500 (Tue, 26 Feb 2008)
New Revision: 13741

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/dns.c
Log:
 r14472@tombo:  nickm | 2008-02-26 13:44:08 -0500
 Backport trivial fix for problem that kept nameserver errors from getting reported.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r14472] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2008-02-26 19:26:45 UTC (rev 13740)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2008-02-26 19:27:39 UTC (rev 13741)
@@ -20,6 +20,7 @@
     - 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

Modified: tor/branches/tor-0_1_2-patches/src/or/dns.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/dns.c	2008-02-26 19:26:45 UTC (rev 13740)
+++ tor/branches/tor-0_1_2-patches/src/or/dns.c	2008-02-26 19:27:39 UTC (rev 13741)
@@ -185,7 +185,7 @@
   }
   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. */