tor

commit 8a5590ebace8a1c1b367e0eec29ed8bc2712e812
parent 67abf55d6b2d2c10a1e666e0295d40890935f304
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  6 Nov 2018 15:19:04 -0500

Merge remote-tracking branch 'tor-github/pr/484' into maint-0.3.5

Diffstat:
A
changes/bug28298
 | 
4
++++
M
src/app/config/config.c
 | 
14
++++++++------

2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/changes/bug28298 b/changes/bug28298
@@ -0,0 +1,4 @@
+  o Minor bugfixes (configuration):
+    - Resume refusing to start with relative file paths and RunAsDaemon
+      set (regression from the fix for bug 22731). Fixes bug 28298;
+      bugfix on 0.3.3.1-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
@@ -3375,12 +3375,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
    * Always use the value of UseEntryGuards, not UseEntryGuards_option. */
   options->UseEntryGuards = options->UseEntryGuards_option;
 
-  if (warn_about_relative_paths(options) && options->RunAsDaemon) {
-    REJECT("You have specified at least one relative path (see above) "
-           "with the RunAsDaemon option. RunAsDaemon is not compatible "
-           "with relative paths.");
-  }
-
   if (server_mode(options) &&
       (!strcmpstart(uname, "Windows 95") ||
        !strcmpstart(uname, "Windows 98") ||
@@ -3397,6 +3391,14 @@ options_validate(or_options_t *old_options, or_options_t *options,
   if (validate_data_directories(options)<0)
     REJECT("Invalid DataDirectory");
 
+  /* need to check for relative paths after we populate
+   * options->DataDirectory (just above). */
+  if (warn_about_relative_paths(options) && options->RunAsDaemon) {
+    REJECT("You have specified at least one relative path (see above) "
+           "with the RunAsDaemon option. RunAsDaemon is not compatible "
+           "with relative paths.");
+  }
+
   if (options->Nickname == NULL) {
     if (server_mode(options)) {
       options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME);