nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Warn about missing ContactInfo when MyFamily set

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

Signed-off-by: José M. Guisado <guigom@riseup.net>
This commit is contained in:
José M. Guisado 2019-01-31 13:27:42 +01:00
parent d1af4d65df
commit cb1072790f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket25110 Normal file
View File

@ -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
src/app/config/config.c
View File

@ -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;