nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:56:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3

Browse Source 
Conflicts:
        src/app/config/config.c
This commit is contained in:
Nick Mathewson 2020-03-12 12:45:56 -04:00
commit e03bb35f90
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket33361 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfix (relay, configuration):
- Now warn if the ContactInfo field is not set and mention that the relay
might get rejected if so. Fixes bug 33361; bugfix on 0.1.1.10-alpha.

12
src/feature/relay/relay_config.c
View File

@ -400,10 +400,14 @@ options_validate_relay_info(const or_options_t *old_options,
}
}
if (server_mode(options) && !options->ContactInfo)
log_notice(LD_CONFIG, "Your ContactInfo config option is not set. "
"Please consider setting it, so we can contact you if your server is "
"misconfigured or something else goes wrong.");
if (server_mode(options) && !options->ContactInfo) {
log_warn(LD_CONFIG,
"Your ContactInfo config option is not set. Please strongly "
"consider setting it, so we can contact you if your relay is "
"misconfigured, end-of-life, or something else goes wrong. "
"It is also possible that your relay might get rejected from "
"the network due to a missing valid contact address.");
}
const char *ContactInfo = options->ContactInfo;
if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo)))