diff options
| author | teor <teor@torproject.org> | 2019-10-31 00:28:05 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-04 13:10:00 +1000 |
| commit | d3c8486724ad29c732bbae591f11b0597641a446 (patch) | |
| tree | 542f5791879a7942bd0092d725dab1dc5a8705f8 /src/core/include.am | |
| parent | 85e50954d85e0372d2f4e854e651817389b4ece9 (diff) | |
| download | tor-d3c8486724ad29c732bbae591f11b0597641a446.tar.gz tor-d3c8486724ad29c732bbae591f11b0597641a446.zip | |
relay: Disable relay config when the module is disabled
This commit:
* disables the ORPort, DirPort, DirCache, and BridgeRelay options,
* sets ClientOnly 1,
* disables relay_config.c and relay/transport_config.c,
* disables test_rebind.sh, and
* modifies the expected results for test_parseconf.sh,
when the relay module is disabled.
Part of 32213.
Diffstat (limited to 'src/core/include.am')
| -rw-r--r-- | src/core/include.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/include.am b/src/core/include.am index eda929df4a..a69914619e 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -143,13 +143,11 @@ LIBTOR_APP_A_SOURCES = \ src/feature/relay/dns.c \ src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ - src/feature/relay/relay_config.c \ src/feature/relay/relay_periodic.c \ src/feature/relay/relay_sys.c \ src/feature/relay/router.c \ src/feature/relay/routerkeys.c \ src/feature/relay/selftest.c \ - src/feature/relay/transport_config.c \ src/feature/rend/rendcache.c \ src/feature/rend/rendclient.c \ src/feature/rend/rendcommon.c \ @@ -173,11 +171,13 @@ endif LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) # The Relay module. -MODULE_RELAY_SOURCES = \ - src/feature/relay/routermode.c +MODULE_RELAY_SOURCES = \ + src/feature/relay/routermode.c \ + src/feature/relay/relay_config.c \ + src/feature/relay/transport_config.c # The Directory Authority module. -MODULE_DIRAUTH_SOURCES = \ +MODULE_DIRAUTH_SOURCES = \ src/feature/dirauth/authmode.c \ src/feature/dirauth/bridgeauth.c \ src/feature/dirauth/bwauth.c \ |