aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-18 14:49:39 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-18 14:54:27 -0400
commitb8fe8ee7486f43b33ccd5cfad99a5e87a7d246f6 (patch)
tree60585fe7509c71185e7fd6308e300624c579c909 /src/common
parenteb896d5e6f09902a760af010326b79ce82492da1 (diff)
downloadtor-b8fe8ee7486f43b33ccd5cfad99a5e87a7d246f6.tar
tor-b8fe8ee7486f43b33ccd5cfad99a5e87a7d246f6.tar.gz
Improved message when running sandbox on Linux without libseccomp
Previously we said "Sandbox is not implemented on this platform" on Linux boxes without libseccomp. Now we say that you need to build Tor built with libseccomp. Fixes bug 11543; bugfix on 0.2.5.1-alpha.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/sandbox.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 4224e03e2..4ce9aa920 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -1613,21 +1613,19 @@ sandbox_init(sandbox_cfg_t *cfg)
#if defined(USE_LIBSECCOMP)
return initialise_libseccomp_sandbox(cfg);
-#elif defined(_WIN32)
+#elif defined(__linux__)
(void)cfg;
- log_warn(LD_BUG,"Windows sandboxing is not implemented. The feature is "
- "currently disabled.");
+ log_warn(LD_GENERAL,
+ "This version of Tor was built without support for sanboxing. To "
+ "build with support for sandboxing on Linux, you must have "
+ "libseccomp and its necessary header files (e.g. seccomp.h).");
return 0;
-#elif defined(TARGET_OS_MAC)
- (void)cfg;
- log_warn(LD_BUG,"Mac OSX sandboxing is not implemented. The feature is "
- "currently disabled");
- return 0;
#else
(void)cfg;
- log_warn(LD_BUG,"Sandboxing is not implemented for your platform. The "
- "feature is currently disabled");
+ log_warn(LD_GENERAL,
+ "Currently, sandboxing is only implemented on Linux. The feature "
+ "is disabled on your platform.");
return 0;
#endif
}