diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-06-11 11:46:38 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-06-11 11:46:38 -0400 |
| commit | 8e112cecd8cf944e095304257563415e60891780 (patch) | |
| tree | 7cc58a9a1a7475e03719a321e7df3afbace67e98 /src/app/config | |
| parent | e9d99d2e15f09a394ad01189b7965af4888a61a6 (diff) | |
| parent | 58cb98af32e8436eccf9536255b8158271f1c03d (diff) | |
| download | tor-8e112cecd8cf944e095304257563415e60891780.tar.gz tor-8e112cecd8cf944e095304257563415e60891780.zip | |
Merge branch 'tor-github/pr/1031'
Diffstat (limited to 'src/app/config')
| -rw-r--r-- | src/app/config/config.c | 9 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index a061871748..6bcf511565 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -593,7 +593,7 @@ static config_var_t option_vars_[] = { V(RecommendedVersions, LINELIST, NULL), V(RecommendedClientVersions, LINELIST, NULL), V(RecommendedServerVersions, LINELIST, NULL), - V(RecommendedPackages, LINELIST, NULL), + OBSOLETE("RecommendedPackages"), V(ReducedConnectionPadding, BOOL, "0"), V(ConnectionPadding, AUTOBOOL, "auto"), V(RefuseUnknownExits, AUTOBOOL, "auto"), @@ -3522,13 +3522,6 @@ options_validate(or_options_t *old_options, or_options_t *options, "features to be broken in unpredictable ways."); } - for (cl = options->RecommendedPackages; cl; cl = cl->next) { - if (! validate_recommended_package_line(cl->value)) { - log_warn(LD_CONFIG, "Invalid RecommendedPackage line %s will be ignored", - escaped(cl->value)); - } - } - if (options->AuthoritativeDir) { if (!options->ContactInfo && !options->TestingTorNetwork) REJECT("Authoritative directory servers must set ContactInfo"); diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 2ee2d15674..8156d2ca11 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -121,7 +121,6 @@ struct or_options_t { struct config_line_t *RecommendedVersions; struct config_line_t *RecommendedClientVersions; struct config_line_t *RecommendedServerVersions; - struct config_line_t *RecommendedPackages; /** Whether dirservers allow router descriptors with private IPs. */ int DirAllowPrivateAddresses; /** Whether routers accept EXTEND cells to routers with private IPs. */ |