Commit 2a31f09a authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

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

 Resolve XXXX020s in config.c


svn:r11108
parent 42fa1de5
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment