소스 검색

Warn about missing ContactInfo when MyFamily set

Operators should be warned when setting MyFamily in
addition to missing ContactInfo

Signed-off-by: José M. Guisado <guigom@riseup.net>
José M. Guisado 5 년 전
부모
커밋
cb1072790f
2개의 변경된 파일8개의 추가작업 그리고 0개의 파일을 삭제
  1. 4 0
      changes/ticket25110
  2. 4 0
      src/app/config/config.c

+ 4 - 0
changes/ticket25110

@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging, configuration):
+    - Warn operators when MyFamily option is set but ContactInfo
+      is missing, as the latter should be set too.
+      Fixes bug 25110; bugfix on 0.3.3.1-alpha.

+ 4 - 0
src/app/config/config.c

@@ -4179,6 +4179,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
              "You should also make sure you aren't listing this bridge's "
              "fingerprint in any other MyFamily.");
   }
+  if (options->MyFamily_lines && !options->ContactInfo) {
+    log_warn(LD_CONFIG, "MyFamily is set but ContactInfo is not configured. "
+             "ContactInfo should always be set when MyFamily option is too.");
+  }
   if (normalize_nickname_list(&options->MyFamily,
                               options->MyFamily_lines, "MyFamily", msg))
     return -1;