torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

r14018@Kushana: nickm | 2007-08-14 15:39:35 -0400

Browse Source 
Resolve XXXX020s in config.c


svn:r11108
This commit is contained in:
Nick Mathewson
2007-08-14 20:19:46 +00:00
parent 42fa1de585
commit 2a31f09af6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/config.c
+6 -6
View File
@@ -760,10 +760,7 @@ config_free_all(void)
const char *
safe_str(const char *address)
{
if (!address) { /* XXX020 eventually turn this into an assert */
log_warn(LD_BUG, "safe_str() called with NULL address.");
return "EMPTY";
}
tor_assert(address);
if (get_options()->SafeLogging)
return "[scrubbed]";
else
@@ -2640,8 +2637,11 @@ options_validate(or_options_t *old_options, or_options_t *options,
"extra-info documents. Setting DownloadExtraInfo.");
options->DownloadExtraInfo = 1;
}
/* XXXX020 Check that at least one of Bridge/HS/V1/V2/V2{AuthoritativeDir}
* is set. */
if (!(options->BridgeAuthoritativeDir || options->HSAuthoritativeDir ||
options->V1AuthoritativeDir || options->V2AuthoritativeDir ||
options->V3AuthoritativeDir))
REJECT("AuthoritativeDir is set, but none of "
"(Bridge/HS/V1/V2/V3)AuthoriativeDir is set.");
}
if (options->AuthoritativeDir && !options->DirPort)