1 files changed, 9 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index d900df4b5..1693cfae8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -854,6 +854,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE([SYSLOG_R_SAFE_IN_SIGHAND], [1],
             [syslog_r function is safe to use in in a signal handler])
         TEST_MALLOC_OPTIONS="AFGJPRX"
+        AC_CHECK_FUNCS([tame])
         ;;
 *-*-solaris*)
         if test "x$withval" != "xno" ; then
@@ -2997,7 +2998,7 @@ fi
 # Decide which sandbox style to use
 sandbox_arg=""
 AC_ARG_WITH([sandbox],
-        [  --with-sandbox=style    Specify privilege separation sandbox (no, darwin, rlimit, systrace, seccomp_filter, capsicum)],
+        [  --with-sandbox=style    Specify privilege separation sandbox (no, capsicum, darwin, rlimit, seccomp_filter, systrace, tame)],
         [
                 if test "x$withval" = "xyes" ; then
                         sandbox_arg=""
@@ -3093,7 +3094,13 @@ AC_RUN_IFELSE(
         [AC_MSG_WARN([cross compiling: assuming yes])]
 )
 
-if test "x$sandbox_arg" = "xsystrace" || \
+if test "x$sandbox_arg" = "xtame" || \
+   ( test -z "$sandbox_arg" && test "x$ac_cv_func_tame" = "xyes" ) ; then
+        test "x$ac_cv_func_tame" != "xyes" && \
+                AC_MSG_ERROR([tame sandbox requires tame(2) support])
+        SANDBOX_STYLE="tame"
+        AC_DEFINE([SANDBOX_TAME], [1], [Sandbox using tame(2)])
+elif test "x$sandbox_arg" = "xsystrace" || \
    ( test -z "$sandbox_arg" && test "x$have_systr_policy_kill" = "x1" ) ; then
         test "x$have_systr_policy_kill" != "x1" && \
                 AC_MSG_ERROR([systrace sandbox requires systrace headers and SYSTR_POLICY_KILL support])