Fix up include paths for sandbox.h (automated)

diff --git a/src/common/compat.c b/src/common/compat.c
index 9575ab0808ce9dd837816f8e9f5600334bafa9ad..9cc0b4f040af4e29b4c98475ef7556e57f7120e6 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -129,7 +129,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt)
 #include "lib/container/smartlist.h"
 #include "lib/wallclock/tm_cvt.h"
 #include "lib/net/address.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 
 /** As open(path, flags, mode), but return an fd with the close-on-exec mode
  * set. */

diff --git a/src/common/storagedir.c b/src/common/storagedir.c
index 10b2301274bc3b38363ed0f4be8eefefd6e1bb83..0e0618d517e766e50c80de1f607671e7fcf85616 100644 (file)
--- a/src/common/storagedir.c
+++ b/src/common/storagedir.c
@@ -5,7 +5,7 @@
 #include "common/compat.h"
 #include "common/confline.h"
 #include "common/memarea.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "common/storagedir.h"
 #include "lib/log/torlog.h"
 #include "common/util.h"

diff --git a/src/common/util.c b/src/common/util.c
index 25eba4b577b71d22e991440f6869cf5e9ab62ebe..8334dd7ae0f5aaa70a4a8257908689473dc01b11 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -21,7 +21,7 @@
 #include "lib/container/smartlist.h"
 #include "lib/fdio/fdio.h"
 #include "lib/net/address.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "lib/err/backtrace.h"
 #include "common/util_process.h"
 #include "common/util_format.h"

diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c
index fcd6945c84af6df98b2d179ed9044a44de144fb7..9df9e364420e11976ebb847f3dca181485951f2e 100644 (file)
--- a/src/lib/crypt_ops/crypto.c
+++ b/src/lib/crypt_ops/crypto.c
@@ -67,7 +67,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/crypt_ops/aes.h"
 #include "common/util.h"
 #include "common/compat.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "common/util_format.h"
 
 #include "keccak-tiny/keccak-tiny.h"

diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c
index bff32c7ec67487e0e1c2a1e611089f8b3f0b1129..bf6a35ddbc75cebe1f361f19cf1dddc48e7df7cd 100644 (file)
--- a/src/lib/crypt_ops/crypto_rand.c
+++ b/src/lib/crypt_ops/crypto_rand.c
@@ -25,7 +25,7 @@
 #include "common/compat.h"
 #include "lib/crypt_ops/compat_openssl.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "lib/testsupport/testsupport.h"
 #include "lib/log/torlog.h"
 #include "common/util.h"

diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 9842fd9831aa5a74f1c1db93844d86ac97e8691d..f6f445df02d1629934534876995a410c85313e64 100644 (file)
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "lib/container/map.h"
 #include "lib/err/torerr.h"
 #include "lib/log/torlog.h"

diff --git a/src/or/config.c b/src/or/config.c
index cc3cc3ec550594557b43d0d1a77f091a310e709a..98f3ff77b02be91efe182435335834c3118956b7 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -98,7 +98,7 @@
 #include "or/hs_config.h"
 #include "or/rephist.h"
 #include "or/router.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "common/util.h"
 #include "or/routerlist.h"
 #include "or/routerset.h"

diff --git a/src/or/connection.c b/src/or/connection.c
index e06e9c650af1dd88871a59c2cd5497974c26b407..01067e94f43e42689db856195efa6bae05a33fe7 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -102,7 +102,7 @@
 #include "or/routerlist.h"
 #include "or/transports.h"
 #include "or/routerparse.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

diff --git a/src/or/dns.c b/src/or/dns.c
index 8d809d8c3c8091cc471a2ddecff908dcca50c321..ddb50d1964813b0c024c4638e2ed89b7312693b0 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -63,7 +63,7 @@
 #include "or/relay.h"
 #include "or/router.h"
 #include "ht.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 
 #include "or/edge_connection_st.h"
 #include "or/or_circuit_st.h"

diff --git a/src/or/main.c b/src/or/main.c
index c690fdd90630d9742274ae8010f8b82a29d7ced2..1c77cdfb56cfb2ada9cb69fc33747f8c6aac5861 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -111,7 +111,7 @@
 #include "common/util_process.h"
 #include "or/ext_orport.h"
 #include "common/memarea.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 
 #include <event2/event.h>
 

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 66967f13f50e616e1931884dd9e5e1c6a0250026..a86e29adb24cdf0180699d057ac9b4639195e1a4 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -119,7 +119,7 @@
 #include "or/routerlist.h"
 #include "or/routerparse.h"
 #include "or/routerset.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "or/torcert.h"
 
 #include "or/dirauth/dirvote.h"

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 91475cd5113d72e68254be0763c17b429f1852b4..8f5113f041ffee684cafef8bb9f7cc71469036d6 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -74,7 +74,7 @@
 #include "or/routerkeys.h"
 #include "or/routerlist.h"
 #include "or/routerparse.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "or/shared_random_client.h"
 #include "or/torcert.h"
 #include "or/voting_schedule.h"

diff --git a/src/or/statefile.c b/src/or/statefile.c
index 53a25e13f2c333de2d3be985b778d80c712fd043..80c56b2d52d8a572833709a98e156af3fbddc4ba 100644 (file)
--- a/src/or/statefile.c
+++ b/src/or/statefile.c
@@ -40,7 +40,7 @@
 #include "or/main.h"
 #include "or/rephist.h"
 #include "or/router.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "or/statefile.h"
 
 /** A list of state-file "abbreviations," for compatibility. */

diff --git a/src/test/test_options.c b/src/test/test_options.c
index bf35e3c5bec91b61bca51aea006da5db86905056..6f31d9767383b5caa3f49534032354a7a42e98dc 100644 (file)
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -15,7 +15,7 @@
 #include "or/main.h"
 #include "test/log_test_helpers.h"
 
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 #include "common/memarea.h"
 #include "or/policies.h"
 #include "test/test_helpers.h"

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index a13de0b57591bd79c2ade273d9d4cb230912b798..f307f6a9125fb534246115df28cdd9a53a1cb0cf 100644 (file)
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -8,7 +8,7 @@
 #include "common/util.h"
 #include "lib/net/address.h"
 #include "lib/log/torlog.h"
-#include "common/sandbox.h"
+#include "lib/sandbox/sandbox.h"
 
 #include <stdio.h>
 #include <stdlib.h>