summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-14 16:27:06 +1000
committerteor <teor@torproject.org>2019-11-14 16:27:06 +1000
commit0df8bcfb6fc31fabccf480f5a153174360dffc7a (patch)
tree343922cd888724388f7d126db68521e840cf1cf5 /src/app
parent88c2a23c4b3954b321d2247ca3d66cff68e1912d (diff)
downloadtor-0df8bcfb6fc31fabccf480f5a153174360dffc7a.tar.gz
tor-0df8bcfb6fc31fabccf480f5a153174360dffc7a.zip
relay: Disable relay_sys when the relay module is disabled
Closes ticket 32245.
Diffstat (limited to 'src/app')
-rw-r--r--src/app/main/subsystem_list.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c
index 4a40702e70..a343207c1c 100644
--- a/src/app/main/subsystem_list.c
+++ b/src/app/main/subsystem_list.c
@@ -18,7 +18,6 @@
#include "core/or/or_sys.h"
#include "core/or/orconn_event_sys.h"
#include "feature/control/btrack_sys.h"
-#include "feature/relay/relay_sys.h"
#include "lib/compress/compress_sys.h"
#include "lib/crypt_ops/crypto_sys.h"
#include "lib/err/torerr_sys.h"
@@ -33,6 +32,7 @@
#include "lib/evloop/evloop_sys.h"
#include "feature/dirauth/dirauth_sys.h"
+#include "feature/relay/relay_sys.h"
#include <stddef.h>
@@ -66,7 +66,9 @@ const subsys_fns_t *tor_subsystems[] = {
&sys_mainloop,
&sys_or,
+#ifdef HAVE_MODULE_RELAY
&sys_relay,
+#endif
#ifdef HAVE_MODULE_DIRAUTH
&sys_dirauth,