[tor-commits] [tor/master] Don't exit if we can't find the GuardfractionFile when booting.

nickm at torproject.org nickm at torproject.org
Wed Feb 18 14:20:13 UTC 2015


commit 5c34a53068f5556f5648dfe522030983f552a1fd
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Feb 6 12:20:24 2015 +0000

    Don't exit if we can't find the GuardfractionFile when booting.
    
    ...just disable the feature in that case.
---
 src/or/config.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 230ea7f..b62b9f7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2791,13 +2791,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
     }
     /* same for guardfraction file */
     if (options->GuardfractionFile && !old_options) {
-      file_status_t fs = file_status(options->GuardfractionFile);
-      if (fs == FN_EMPTY) {
-        REJECT("GuardfractionFile set but it's an empty file? Failing");
-      } else if (fs != FN_FILE) {
-        REJECT("GuardfractionFile set but not a file? Failing");
-      }
-
       dirserv_read_guardfraction_file(options->GuardfractionFile, NULL);
     }
   }





More information about the tor-commits mailing list