aboutsummaryrefslogtreecommitdiff
path: root/src/app/config
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2020-06-30 13:55:39 +0000
committerAlexander Færøy <ahf@torproject.org>2020-06-30 13:55:39 +0000
commit8444fbe904141d7954efe221b663efee1774df41 (patch)
tree60469f39d42cc4b82e9ffec828038aaa99332526 /src/app/config
parentc3ad2a1d2367d6c0ba5c1c81491770056e881a77 (diff)
parent8dc7ad1275a53cfe490128e7fb25b759dd7d88b5 (diff)
downloadtor-8444fbe904141d7954efe221b663efee1774df41.tar.gz
tor-8444fbe904141d7954efe221b663efee1774df41.zip
Merge branch 'tor-github/pr/1793' into maint-0.3.5
Diffstat (limited to 'src/app/config')
-rw-r--r--src/app/config/config.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index cbca7d3899..1d61b76310 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options, or_options_t *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)))
REJECT("ContactInfo config option must be UTF-8.");