[or-cvs] r13681: Fix a really stupid parthensis error noticed by mwenge. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-02-22 15:33:47 -0500 (Fri, 22 Feb 2008)
New Revision: 13681

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/dns.c
Log:
 r14401 at tombo:  nickm | 2008-02-22 15:33:42 -0500
 Fix a really stupid parthensis error noticed by mwenge.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14401] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-02-22 19:09:45 UTC (rev 13680)
+++ tor/trunk/ChangeLog	2008-02-22 20:33:47 UTC (rev 13681)
@@ -94,6 +94,8 @@
       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,

Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c	2008-02-22 19:09:45 UTC (rev 13680)
+++ tor/trunk/src/or/dns.c	2008-02-22 20:33:47 UTC (rev 13681)
@@ -156,7 +156,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;
     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;