From: Sebastian Hahn <sebastian@torproject.org>
Date: Thu, 23 Jul 2009 11:45:04 +0000 (+0200)
Subject: don't warn about DirReqStatistics when the option is disabled
X-Git-Tag: tor-0.2.2.1-alpha~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c0b418a6f7d46b675a6bc91a7fd83cba6889d30;p=thirdparty%2Ftor.git

don't warn about DirReqStatistics when the option is disabled

Reported by Zax on #tor
---

diff --git a/src/or/config.c b/src/or/config.c
index 1ec666ad9a..46d147090b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1378,8 +1378,8 @@ options_act(or_options_t *old_options)
     tor_free(actual_fname);
   }
 
-#ifdef ENABLE_DIRREQ_STATS
   if (options->DirReqStatistics) {
+#ifdef ENABLE_DIRREQ_STATS
     /* Check if GeoIP database could be loaded. */
     if (!geoip_is_loaded()) {
       log_warn(LD_CONFIG, "Configured to measure directory request "
@@ -1390,11 +1390,11 @@ options_act(or_options_t *old_options)
                "country and write aggregate statistics to disk. Check the "
                "dirreq-stats file in your data directory that will first "
                "be written in 24 hours from now.");
-  }
 #else
   log_warn(LD_CONFIG, "DirReqStatistics enabled, but Tor was built "
            "without support for directory request statistics.");
 #endif
+  }
 
 #ifdef ENABLE_EXIT_STATS
   if (options->ExitPortStatistics)