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 7d73e4034315e02d940d0e5052b53e91c2950399..e2ac5174bf2290703ccd7adae8d3e1da2edeb7bf 100644 (file)
--- 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 61d0558d68b147f7e44ec5d626585a3c680db372..20070b7e117e14eccf59121ba16f5ba3a89c95c2 100644 (file)
--- 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();