aboutsummaryrefslogtreecommitdiff
path: root/src/app/config/config.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2019-02-20 11:45:58 -0500
committerDavid Goulet <dgoulet@torproject.org>2019-02-20 11:45:58 -0500
commit8f5a3c046004f7c820b779502f1c080ae64f0da9 (patch)
treee3904916e0d5dd7647bf0ff1966b3e5d922ff395 /src/app/config/config.c
parenta30f17f72fb4e016f1c0d7f8619fcb20fec29d16 (diff)
parentcb1072790f17cd43787a41c04b36a24833fbf7ee (diff)
downloadtor-8f5a3c046004f7c820b779502f1c080ae64f0da9.tar.gz
tor-8f5a3c046004f7c820b779502f1c080ae64f0da9.zip
Merge branch 'tor-github/pr/675'
Diffstat (limited to 'src/app/config/config.c')
-rw-r--r--src/app/config/config.c4
1 files changed, 4 insertions, 0 deletions
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;