diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 74d5263a4..31e72867f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.478 2011/06/26 21:18:20 djm Exp $ | 1 | # $Id: configure.ac,v 1.479 2011/08/17 01:59:26 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.478 $) | 18 | AC_REVISION($Revision: 1.479 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -2476,7 +2476,7 @@ AC_SUBST([SSH_PRIVSEP_USER]) | |||
2476 | # Decide which sandbox style to use | 2476 | # Decide which sandbox style to use |
2477 | sandbox_arg="" | 2477 | sandbox_arg="" |
2478 | AC_ARG_WITH([sandbox], | 2478 | AC_ARG_WITH([sandbox], |
2479 | [ --with-sandbox=style Specify privilege separation sandbox (no, rlimit, systrace)], | 2479 | [ --with-sandbox=style Specify privilege separation sandbox (no, darwin, rlimit, systrace)], |
2480 | [ | 2480 | [ |
2481 | if test "x$withval" = "xyes" ; then | 2481 | if test "x$withval" = "xyes" ; then |
2482 | sandbox_arg="" | 2482 | sandbox_arg="" |
@@ -2487,15 +2487,22 @@ AC_ARG_WITH([sandbox], | |||
2487 | ) | 2487 | ) |
2488 | if test "x$sandbox_arg" = "xsystrace" || \ | 2488 | if test "x$sandbox_arg" = "xsystrace" || \ |
2489 | ( test -z "$sandbox_arg" && test "x$have_systr_policy_kill" = "x1" ) ; then | 2489 | ( test -z "$sandbox_arg" && test "x$have_systr_policy_kill" = "x1" ) ; then |
2490 | test "x$have_systr_policy_kill" != "x1" && \ | ||
2491 | AC_MSG_ERROR([systrace sandbox requires systrace headers and SYSTR_POLICY_KILL support]) | ||
2490 | SANDBOX_STYLE="systrace" | 2492 | SANDBOX_STYLE="systrace" |
2491 | AC_DEFINE([SANDBOX_SYSTRACE], [1], [Sandbox using systrace(4)]) | 2493 | AC_DEFINE([SANDBOX_SYSTRACE], [1], [Sandbox using systrace(4)]) |
2492 | elif test "x$sandbox_arg" = "xdarwin" || \ | 2494 | elif test "x$sandbox_arg" = "xdarwin" || \ |
2493 | ( test -z "$sandbox_arg" && test "x$ac_cv_func_sandbox_init" = "xyes" && \ | 2495 | ( test -z "$sandbox_arg" && test "x$ac_cv_func_sandbox_init" = "xyes" && \ |
2494 | test "x$ac_cv_header_sandbox_h" = "xyes") ; then | 2496 | test "x$ac_cv_header_sandbox_h" = "xyes") ; then |
2497 | test "x$ac_cv_func_sandbox_init" != "xyes" -o \ | ||
2498 | "x$ac_cv_header_sandbox_h" != "xyes" && \ | ||
2499 | AC_MSG_ERROR([Darwin seatbelt sandbox requires sandbox.h and sandbox_init function]) | ||
2495 | SANDBOX_STYLE="darwin" | 2500 | SANDBOX_STYLE="darwin" |
2496 | AC_DEFINE([SANDBOX_DARWIN], [1], [Sandbox using Darwin sandbox_init(3)]) | 2501 | AC_DEFINE([SANDBOX_DARWIN], [1], [Sandbox using Darwin sandbox_init(3)]) |
2497 | elif test "x$sandbox_arg" = "xrlimit" || \ | 2502 | elif test "x$sandbox_arg" = "xrlimit" || \ |
2498 | ( test -z "$sandbox_arg" && test "x$ac_cv_func_setrlimit" = "xyes" ) ; then | 2503 | ( test -z "$sandbox_arg" && test "x$ac_cv_func_setrlimit" = "xyes" ) ; then |
2504 | test "x$ac_cv_func_setrlimit" != "xyes" && \ | ||
2505 | AC_MSG_ERROR([rlimit sandbox requires setrlimit function]) | ||
2499 | SANDBOX_STYLE="rlimit" | 2506 | SANDBOX_STYLE="rlimit" |
2500 | AC_DEFINE([SANDBOX_RLIMIT], [1], [Sandbox using setrlimit(2)]) | 2507 | AC_DEFINE([SANDBOX_RLIMIT], [1], [Sandbox using setrlimit(2)]) |
2501 | elif test -z "$sandbox_arg" || test "x$sandbox_arg" = "xno" || \ | 2508 | elif test -z "$sandbox_arg" || test "x$sandbox_arg" = "xno" || \ |