commit 55b793936725aba0c615c748838187a589c5d6d4 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 27 09:49:08 2018 -0400

Fix up include paths for sandbox.h (automated) --- src/common/compat.c | 2 +- src/common/storagedir.c | 2 +- src/common/util.c | 2 +- src/lib/crypt_ops/crypto.c | 2 +- src/lib/crypt_ops/crypto_rand.c | 2 +- src/lib/sandbox/sandbox.c | 2 +- src/or/config.c | 2 +- src/or/connection.c | 2 +- src/or/dns.c | 2 +- src/or/main.c | 2 +- src/or/routerlist.c | 2 +- src/or/routerparse.c | 2 +- src/or/statefile.c | 2 +- src/test/test_options.c | 2 +- src/tools/tor-resolve.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c index 9575ab080..9cc0b4f04 100644 --- 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 10b230127..0e0618d51 100644 --- 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 25eba4b57..8334dd7ae 100644 --- 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 fcd6945c8..9df9e3644 100644 --- 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 bff32c7ec..bf6a35ddb 100644 --- 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 9842fd983..f6f445df0 100644 --- 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 cc3cc3ec5..98f3ff77b 100644 --- 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 e06e9c650..01067e94f 100644 --- 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 8d809d8c3..ddb50d196 100644 --- 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 c690fdd90..1c77cdfb5 100644 --- 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 66967f13f..a86e29adb 100644 --- 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 91475cd51..8f5113f04 100644 --- 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 53a25e13f..80c56b2d5 100644 --- 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 bf35e3c5b..6f31d9767 100644 --- 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 a13de0b57..f307f6a91 100644 --- 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>