From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 19 Mar 2025 17:40:46 +0000 (-0400)
Subject: Fix compilation with --disable-relay-mode.
X-Git-Tag: tor-0.4.9.2-alpha~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b53735fdef041c23156dd3dd7d0ad31f908e28f;p=thirdparty%2Ftor.git

Fix compilation with --disable-relay-mode.

Broken with my happy-family-sandbox patch;
bug not in any released Tor.
---

diff --git a/src/app/main/main.c b/src/app/main/main.c
index 7d73e40343..e2ac5174bf 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -957,6 +957,7 @@ sandbox_init_filter(void)
   OPEN("/etc/hosts");
   OPEN("/proc/meminfo");
 
+#ifdef HAVE_MODULE_RELAY
   {
     smartlist_t *family_id_files =
       list_family_key_files(options, options->KeyDirectory);
@@ -967,6 +968,7 @@ sandbox_init_filter(void)
     SMARTLIST_FOREACH(family_id_files, char *, cp, tor_free(cp));
     smartlist_free(family_id_files);
   }
+#endif
 
   if (options->BridgeAuthoritativeDir)
     OPEN_DATADIR_SUFFIX("networkstatus-bridges", ".tmp");
diff --git a/src/feature/relay/relay_handshake.h b/src/feature/relay/relay_handshake.h
index 61d0558d68..20070b7e11 100644
--- a/src/feature/relay/relay_handshake.h
+++ b/src/feature/relay/relay_handshake.h
@@ -60,7 +60,6 @@ connection_or_compute_authenticate_cell_body(
 {
   (void)conn;
   (void)authtype;
-  (void)signing_key;
   (void)ed_signing_key;
   (void)server;
   tor_assert_nonfatal_unreached();