mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Convert authdir_mode_handles_descs(options, -1) with authdir_mode(options)
This commit is contained in:
+1
-1
@@ -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
@@ -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
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user