diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-02-07 14:05:33 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-02-07 14:05:33 -0500 |
| commit | 652d3a5b665f8045374eb527494dd9d80ef98d13 (patch) | |
| tree | 9c2d0065c5b464755ee13daea50e8b044c74022a /src/or/config.c | |
| parent | bf91da75abf84a6a61aa92adc5156ba1d5c15998 (diff) | |
| download | tor-652d3a5b665f8045374eb527494dd9d80ef98d13.tar.gz tor-652d3a5b665f8045374eb527494dd9d80ef98d13.zip | |
Remove anything related to the old SocksSockets option
At this commit, the SocksSocketsGroupWritable option is renamed to
UnixSocksGroupWritable. A deprecated warning is triggered if the old option is
used and tor will use it properly.
Fixes #24343
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index c246bd00e1..d76a53a375 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -171,6 +171,7 @@ static config_abbrev_t option_abbrevs_[] = { { "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0}, { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, { "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0}, + { "SocksSocketsGroupWritable", "UnixSocksGroupWritable", 0, 1}, { NULL, NULL, 0, 0}, }; @@ -284,7 +285,7 @@ static config_var_t option_vars_[] = { V(ControlPortWriteToFile, FILENAME, NULL), V(ControlSocket, LINELIST, NULL), V(ControlSocketsGroupWritable, BOOL, "0"), - V(SocksSocketsGroupWritable, BOOL, "0"), + V(UnixSocksGroupWritable, BOOL, "0"), V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), V(CookieAuthFile, STRING, NULL), @@ -7356,7 +7357,7 @@ parse_ports(or_options_t *options, int validate_only, *n_ports_out = 0; - const unsigned gw_flag = options->SocksSocketsGroupWritable ? + const unsigned gw_flag = options->UnixSocksGroupWritable ? CL_PORT_DFLT_GROUP_WRITABLE : 0; if (parse_port_config(ports, options->SocksPort_lines, |