[tor-commits] [doctor/master] Consider all bwauth* params valid on website output.

[karsten at torproject.org]

commit 078a795113b9b5525505a193b4c68c6e9404b316
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Dec 6 07:29:45 2011 +0100

    Consider all bwauth* params valid on website output.
---
 .../torproject/doctor/MetricsWebsiteReport.java    |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/doctor/MetricsWebsiteReport.java b/src/org/torproject/doctor/MetricsWebsiteReport.java
index b7f9888..b03f652 100755
--- a/src/org/torproject/doctor/MetricsWebsiteReport.java
+++ b/src/org/torproject/doctor/MetricsWebsiteReport.java
@@ -403,7 +403,7 @@ public class MetricsWebsiteReport implements Report {
           ("circwindow,CircuitPriorityHalflifeMsec,refuseunknownexits,"
           + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts,"
           + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq,"
-          + "cbtmintimeout,cbtinitialtimeout,bwauthpid").split(",")));
+          + "cbtmintimeout,cbtinitialtimeout").split(",")));
       Map<String, String> consensusConsensusParams =
           downloadedConsensus.getConsensusParams();
       for (Status vote : this.downloadedVotes) {
@@ -416,7 +416,8 @@ public class MetricsWebsiteReport implements Report {
             if (!consensusConsensusParams.containsKey(e.getKey()) ||
                 !consensusConsensusParams.get(e.getKey()).equals(
                 e.getValue()) ||
-                !validParameters.contains(e.getKey())) {
+                (!validParameters.contains(e.getKey()) &&
+                !e.getKey().startsWith("bwauth"))) {
               conflictOrInvalid = true;
               break;
             }