r14700@tombo: nickm | 2007-11-03 22:29:21 -0400

 Fix sign error in networkstatus_note_certs_arrived().

svn:r12371

diff --git a/ChangeLog b/ChangeLog
index 8050421556918903f8c1116a471c2890f7eded9a..e8434aba0c5aaee6c474f5ec26a9c6d68961e856 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,11 @@ Changes in version 0.2.0.10-alpha - 2007-11-0?
       the Tor process. Patch from Marco Bonetti with tweaks from Mike
       Perry.
 
+  o Major bugfixes:
+    - Consider replace the current consensus when certificates arrive
+      that make the pending consensus valid.  Previously, we were only
+      considering replacement when the new certs _didn't_ help.
+
   o Minor bugfixes:
     - Refuse to start if both ORPort and UseBridges are set. Bugfix
       on 0.2.0.x.

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index cacb1307c341c9ba5bc09cc80650b9ca1b9ef9c8..2bb653e3efed6749ad6638f6ef5bda42429612da 100644 (file)
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1384,7 +1384,7 @@ networkstatus_note_certs_arrived(void)
 {
   if (consensus_waiting_for_certs) {
     if (networkstatus_check_consensus_signature(
-                                    consensus_waiting_for_certs, 0)<0) {
+                                    consensus_waiting_for_certs, 0)>=0) {
       if (!networkstatus_set_current_consensus(
                                  consensus_waiting_for_certs_body, 0, 1)) {
         tor_free(consensus_waiting_for_certs_body);