nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5'

Browse Source
This commit is contained in:
Nick Mathewson 2018-11-06 15:20:01 -05:00
commit bb9044381e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug28298 Normal file
View File

@ -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.

14
src/app/config/config.c
View File

@ -3375,12 +3375,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
* Always use the value of UseEntryGuards, not UseEntryGuards_option. */ * Always use the value of UseEntryGuards, not UseEntryGuards_option. */
options->UseEntryGuards = options->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) && if (server_mode(options) &&
(!strcmpstart(uname, "Windows 95") || (!strcmpstart(uname, "Windows 95") ||
!strcmpstart(uname, "Windows 98") || !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) if (validate_data_directories(options)<0)
REJECT("Invalid DataDirectory"); 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 (options->Nickname == NULL) {
if (server_mode(options)) { if (server_mode(options)) {
options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME); options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME);