diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-06 17:07:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-06 17:07:40 -0500 |
| commit | 6bb31cba1286e843ac7d32a24a9424587bc29623 (patch) | |
| tree | 6c2172979323366f81f3d86bef3c0ead4634f293 /src/or/config.c | |
| parent | 14dedff0abd8b6b9c1c2766fe0ce5844c77d58ac (diff) | |
| download | tor-6bb31cba1286e843ac7d32a24a9424587bc29623.tar.gz tor-6bb31cba1286e843ac7d32a24a9424587bc29623.zip | |
New option "--disable-system-torrc" to not read torrc from etc
Implements 13037.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 543d7fa285..5bd5ff4770 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4013,7 +4013,10 @@ get_windows_conf_root(void) static const char * get_default_conf_file(int defaults_file) { -#ifdef _WIN32 +#ifdef DISABLE_SYSTEM_TORRC + (void) defaults_file; + return NULL; +#elif defined(_WIN32) if (defaults_file) { static char defaults_path[MAX_PATH+1]; tor_snprintf(defaults_path, MAX_PATH, "%s\\torrc-defaults", |