[or-cvs] [tor/maint-0.2.1] fix the other half of bug 1074

[arma@xxxxxxxxxxxxxx]

commit 28de4d83fd59bd656ebcda4442dc10482b8fb00a
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Thu Feb 10 17:11:06 2011 -0500

    fix the other half of bug 1074
---
 changes/bug1074-part2 |    6 ++++++
 src/or/directory.c    |    7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/changes/bug1074-part2 b/changes/bug1074-part2
new file mode 100644
index 0000000..6644f49
--- /dev/null
+++ b/changes/bug1074-part2
@@ -0,0 +1,6 @@
+  o Major bugfixes:
+    - Stop sending a CLOCK_SKEW controller status event whenever
+      we fetch directory information from a relay that has a wrong clock.
+      Instead, only inform the controller when it's a trusted authority
+      that claims our clock is wrong. Bugfix on tor-0.1.2.6-alpha;
+      fixes the other half of bug 1074.
diff --git a/src/or/directory.c b/src/or/directory.c
index 09ebccd..7150fce 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1468,9 +1468,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
              delta>0 ? "ahead" : "behind", dbuf,
              delta>0 ? "behind" : "ahead");
       skewed = 1; /* don't check the recommended-versions line */
-      control_event_general_status(trusted ? LOG_WARN : LOG_NOTICE,
-                               "CLOCK_SKEW SKEW=%ld SOURCE=DIRSERV:%s:%d",
-                               delta, conn->_base.address, conn->_base.port);
+      if (trusted)
+        control_event_general_status(LOG_WARN,
+                                 "CLOCK_SKEW SKEW=%ld SOURCE=DIRSERV:%s:%d",
+                                 delta, conn->_base.address, conn->_base.port);
     } else {
       log_debug(LD_HTTP, "Time on received directory is within tolerance; "
                 "we are %ld seconds skewed.  (That's okay.)", delta);