commit cb1072790f17cd43787a41c04b36a24833fbf7ee Author: José M. Guisado guigom@riseup.net Date: Thu Jan 31 13:27:42 2019 +0100

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 --- changes/ticket25110 | 4 ++++ src/app/config/config.c | 4 ++++ 2 files changed, 8 insertions(+)

diff --git a/changes/ticket25110 b/changes/ticket25110 new file mode 100644 index 000000000..298e33287 --- /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 952b9cd30..6b9162a3d 100644 --- a/src/app/config/config.c +++ b/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;