diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-30 15:12:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-30 15:14:05 -0400 |
| commit | 15371d801cf7668b57bf3eb20f29afb6489bb027 (patch) | |
| tree | 30aad203103b49db531c93677d227f2e13693c5f /src/app | |
| parent | f579541f13d5e196573a73065860337789a38504 (diff) | |
| download | tor-15371d801cf7668b57bf3eb20f29afb6489bb027.tar.gz tor-15371d801cf7668b57bf3eb20f29afb6489bb027.zip | |
Mark more torrc options as FILENAME rather than as STRING.
This will help us reimplement warn_about_relative_paths().
FILENAME options currently are the same as STRINGs in most respects,
except for the type reported to the controller.
In this commit, I'm picking the options to change based on:
* the current contents of warn_about_relative_paths()
* options that end with "File".
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 2f40dd2bb9..cda2440963 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -382,7 +382,7 @@ static const config_var_t option_vars_[] = { V(UnixSocksGroupWritable, BOOL, "0"), V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), - V(CookieAuthFile, STRING, NULL), + V(CookieAuthFile, FILENAME, NULL), V(CountPrivateBandwidth, BOOL, "0"), VAR("DataDirectory", FILENAME, DataDirectory_option, NULL), V(DataDirectoryGroupReadable, BOOL, "0"), @@ -452,7 +452,7 @@ static const config_var_t option_vars_[] = { V(ExtendAllowPrivateAddresses, BOOL, "0"), V(ExitRelay, AUTOBOOL, "auto"), VPORT(ExtORPort), - V(ExtORPortCookieAuthFile, STRING, NULL), + V(ExtORPortCookieAuthFile, FILENAME, NULL), V(ExtORPortCookieAuthFileGroupReadable, BOOL, "0"), V(ExtraInfoStatistics, BOOL, "1"), V(ExtendByEd25519ID, AUTOBOOL, "auto"), @@ -590,7 +590,7 @@ static const config_var_t option_vars_[] = { V(PathsNeededToBuildCircuits, DOUBLE, "-1"), V(PerConnBWBurst, MEMUNIT, "0"), V(PerConnBWRate, MEMUNIT, "0"), - V(PidFile, STRING, NULL), + V(PidFile, FILENAME, NULL), V(TestingTorNetwork, BOOL, "0"), V(TestingMinExitFlagThreshold, MEMUNIT, "0"), V(TestingMinFastFlagThreshold, MEMUNIT, "0"), @@ -635,7 +635,7 @@ static const config_var_t option_vars_[] = { V(ServerDNSAllowNonRFC953Hostnames, BOOL,"0"), V(ServerDNSDetectHijacking, BOOL, "1"), V(ServerDNSRandomizeCase, BOOL, "1"), - V(ServerDNSResolvConfFile, STRING, NULL), + V(ServerDNSResolvConfFile, FILENAME, NULL), V(ServerDNSSearchDomains, BOOL, "0"), V(ServerDNSTestAddresses, CSV, "www.google.com,www.mit.edu,www.yahoo.com,www.slashdot.org"), |