Browse Source

Remove dependency on lib/net from lib/sandbox.

This was trivial, and the easiest way to remove the remaining
.may_include circularities.
Nick Mathewson 5 years ago
parent
commit
c0a7527eb8
3 changed files with 1 additions and 3 deletions
  1. 1 0
      src/app/main/main.c
  2. 0 1
      src/lib/sandbox/.may_include
  3. 0 2
      src/lib/sandbox/sandbox.c

+ 1 - 0
src/app/main/main.c

@@ -1402,6 +1402,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
       tor_free_all(0);
       return -1;
     }
+    tor_make_getaddrinfo_cache_active();
 
     // registering libevent rng
 #ifdef HAVE_EVUTIL_SECURE_RNG_SET_URANDOM_DEVICE_FILE

+ 0 - 1
src/lib/sandbox/.may_include

@@ -5,7 +5,6 @@ lib/container/*.h
 lib/err/*.h
 lib/log/*.h
 lib/malloc/*.h
-lib/net/*.h
 lib/sandbox/*.h
 lib/sandbox/*.inc
 lib/string/*.h

+ 0 - 2
src/lib/sandbox/sandbox.c

@@ -38,7 +38,6 @@
 #include "lib/err/torerr.h"
 #include "lib/log/log.h"
 #include "lib/cc/torint.h"
-#include "lib/net/resolve.h"
 #include "lib/malloc/malloc.h"
 #include "lib/string/scanf.h"
 
@@ -1553,7 +1552,6 @@ install_syscall_filter(sandbox_cfg_t* cfg)
 
   // marking the sandbox as active
   sandbox_active = 1;
-  tor_make_getaddrinfo_cache_active();
 
  end:
   seccomp_release(ctx);