diff options
| author | Neel Chauhan <neel@neelc.org> | 2018-03-20 08:27:41 -0400 |
|---|---|---|
| committer | Isis Lovecruft <isis@torproject.org> | 2018-04-04 00:19:33 +0000 |
| commit | 9df110cd722a383414584d5ff6494944c993bb6d (patch) | |
| tree | 28ee43034c31ca12e52ae20b5042ea3d68a029af /src/or/config.c | |
| parent | 21c81348a39dd235c40656c34abb76daf88e81f3 (diff) | |
| download | tor-9df110cd722a383414584d5ff6494944c993bb6d.tar.gz tor-9df110cd722a383414584d5ff6494944c993bb6d.zip | |
Remove PortForwarding options
Signed-off-by: Isis Lovecruft <isis@torproject.org>
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/or/config.c b/src/or/config.c index 212c6c6b94..a0890e2786 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -492,8 +492,6 @@ static config_var_t option_vars_[] = { V(TestingSigningKeySlop, INTERVAL, "1 day"), V(OptimisticData, AUTOBOOL, "auto"), - V(PortForwarding, BOOL, "0"), - V(PortForwardingHelper, FILENAME, "tor-fw-helper"), OBSOLETE("PreferTunneledDirConns"), V(ProtocolWarnings, BOOL, "0"), V(PublishServerDescriptor, CSV, "1"), @@ -3907,15 +3905,6 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); - if (options->PortForwarding && options->Sandbox) { - REJECT("PortForwarding is not compatible with Sandbox; at most one can " - "be set"); - } - if (options->PortForwarding && options->NoExec) { - COMPLAIN("Both PortForwarding and NoExec are set; PortForwarding will " - "be ignored."); - } - if (ensure_bandwidth_cap(&options->BandwidthRate, "BandwidthRate", msg) < 0) return -1; |