From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 5 Jan 2015 16:39:38 +0000 (-0500)
Subject: Tolerate starting up with missing hidden service directory
X-Git-Tag: tor-0.2.6.3-alpha~209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=276700131a14697aa84d95a867782bbfd612277f;p=thirdparty%2Ftor.git

Tolerate starting up with missing hidden service directory

Fixes bug 14106; bugfix on 0.2.6.2-alpha

Found by stem tests.
---

diff --git a/changes/bug14106 b/changes/bug14106
new file mode 100644
index 0000000000..cf6e568dcc
--- /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 b9d98755ea..3b73674691 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;
     }