diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-12 12:45:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-12 12:45:56 -0400 |
| commit | e03bb35f90f28ae21b9c9e80b5af9a689af9e1dc (patch) | |
| tree | 6b68aadbb69f2c5878b73b6dd40e84c4e57b6af4 | |
| parent | f0646919af14efc82c68535ba60f60cbdacd712f (diff) | |
| parent | b755a489bdcdf56429c2c7e4fd313b2594dc68c0 (diff) | |
| download | tor-e03bb35f90f28ae21b9c9e80b5af9a689af9e1dc.tar.gz tor-e03bb35f90f28ae21b9c9e80b5af9a689af9e1dc.zip | |
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
Conflicts:
src/app/config/config.c
| -rw-r--r-- | changes/ticket33361 | 3 | ||||
| -rw-r--r-- | src/feature/relay/relay_config.c | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/changes/ticket33361 b/changes/ticket33361 new file mode 100644 index 0000000000..bc9715d6a1 --- /dev/null +++ b/changes/ticket33361 @@ -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. diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index 8d20e97eb6..c8b40ae054 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -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))) |