Convert authdir_mode_handles_descs(options, -1) with authdir_mode(options)

This commit is contained in:
huyvq
2017-06-02 23:26:53 +07:00
committed by Nick Mathewson
parent 0471c905a1
commit d92b999757
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -4850,7 +4850,7 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers,
goto done;
}
if (authdir_mode_handles_descs(options, -1) &&
if (authdir_mode(options) &&
!strcmp(url,"/tor/")) { /* server descriptor post */
const char *msg = "[None]";
uint8_t purpose = authdir_mode_bridge(options) ?
+2 -2
View File
@@ -2355,7 +2355,7 @@ do_hup(void)
tor_free(msg);
}
}
if (authdir_mode_handles_descs(options, -1)) {
if (authdir_mode(options)) {
/* reload the approved-routers file */
if (dirserv_load_fingerprint_file() < 0) {
/* warnings are logged from dirserv_load_fingerprint_file() directly */
@@ -3478,7 +3478,7 @@ sandbox_init_filter(void)
if (options->BridgeAuthoritativeDir)
OPEN_DATADIR_SUFFIX("networkstatus-bridges", ".tmp");
if (authdir_mode_handles_descs(options, -1))
if (authdir_mode(options))
OPEN_DATADIR("approved-routers");
if (options->ServerDNSResolvConfFile)
+1 -1
View File
@@ -1635,7 +1635,7 @@ authdir_mode_publishes_statuses(const or_options_t *options)
int
authdir_mode_tests_reachability(const or_options_t *options)
{
return authdir_mode_handles_descs(options, -1);
return authdir_mode(options);
}
/** Return true iff we believe ourselves to be a bridge authoritative
* directory server.