tor

commit 9ca7900e177d454a47973efe25045bb4022b0508
parent df3f2bd9aa55a8ccab6b41c19859b4665ee3e3d2
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 12 Mar 2020 12:46:12 -0400

Merge branch 'maint-0.4.3'

Diffstat:
A
changes/ticket33361
 | 
3
+++
M
src/feature/relay/relay_config.c
 | 
12
++++++++----

2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/changes/ticket33361 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
@@ -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)))