[tor-commits] [tor/master] Tolerate starting up with missing hidden service directory

[nickm@xxxxxxxxxxxxxx]

commit 276700131a14697aa84d95a867782bbfd612277f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jan 5 11:39:38 2015 -0500

    Tolerate starting up with missing hidden service directory
    
    Fixes bug 14106; bugfix on 0.2.6.2-alpha
    
    Found by stem tests.
---
 changes/bug14106     |    4 ++++
 src/or/rendservice.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug14106 b/changes/bug14106
new file mode 100644
index 0000000..cf6e568
--- /dev/null
+++ b/changes/bug14106
@@ -0,0 +1,4 @@
+  o Minor bugfixes (hidden services):
+    - Successfully launch Tor with a nonexistent hidden service directory.
+      Our fix for bug 13942 didn't catch this case. Fixes bug 14106;
+      bugfix on 0.2.6.2-alpha.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index b9d9875..3b73674 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -531,7 +531,7 @@ rend_config_services(const or_options_t *options, int validate_only)
     }
   }
   if (service) {
-    cpd_check_t check_opts = CPD_CHECK_MODE_ONLY;
+    cpd_check_t check_opts = CPD_CHECK_MODE_ONLY|CPD_CHECK;
     if (service->dir_group_readable) {
       check_opts |= CPD_GROUP_READ;
     }

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits