diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-02-20 11:45:58 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-02-20 11:45:58 -0500 |
| commit | 8f5a3c046004f7c820b779502f1c080ae64f0da9 (patch) | |
| tree | e3904916e0d5dd7647bf0ff1966b3e5d922ff395 | |
| parent | a30f17f72fb4e016f1c0d7f8619fcb20fec29d16 (diff) | |
| parent | cb1072790f17cd43787a41c04b36a24833fbf7ee (diff) | |
| download | tor-8f5a3c046004f7c820b779502f1c080ae64f0da9.tar.gz tor-8f5a3c046004f7c820b779502f1c080ae64f0da9.zip | |
Merge branch 'tor-github/pr/675'
| -rw-r--r-- | changes/ticket25110 | 4 | ||||
| -rw-r--r-- | src/app/config/config.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/ticket25110 b/changes/ticket25110 new file mode 100644 index 0000000000..298e33287f --- /dev/null +++ b/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. diff --git a/src/app/config/config.c b/src/app/config/config.c index 7734c19a04..803a0eda54 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4188,6 +4188,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; |