summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-10-14 09:22:15 -0700
committerDamien Miller <djm@mindrot.org>2015-10-14 09:22:15 -0700
commitfafe1d84a210fb3dae7744f268059cc583db8c12 (patch)
tree0fd1e24341575e9272c49230cc8876115371c5d0
parent8f22911027ff6c17d7226d232ccd20727f389310 (diff)
s/SANDBOX_TAME/SANDBOX_PLEDGE/g
-rw-r--r--configure.ac2
-rw-r--r--sandbox-pledge.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 346a90c73..a6f947eb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3099,7 +3099,7 @@ if test "x$sandbox_arg" = "xpledge" || \
3099 test "x$ac_cv_func_pledge" != "xyes" && \ 3099 test "x$ac_cv_func_pledge" != "xyes" && \
3100 AC_MSG_ERROR([pledge sandbox requires pledge(2) support]) 3100 AC_MSG_ERROR([pledge sandbox requires pledge(2) support])
3101 SANDBOX_STYLE="pledge" 3101 SANDBOX_STYLE="pledge"
3102 AC_DEFINE([SANDBOX_TAME], [1], [Sandbox using pledge(2)]) 3102 AC_DEFINE([SANDBOX_PLEDGE], [1], [Sandbox using pledge(2)])
3103elif test "x$sandbox_arg" = "xsystrace" || \ 3103elif test "x$sandbox_arg" = "xsystrace" || \
3104 ( test -z "$sandbox_arg" && test "x$have_systr_policy_kill" = "x1" ) ; then 3104 ( test -z "$sandbox_arg" && test "x$have_systr_policy_kill" = "x1" ) ; then
3105 test "x$have_systr_policy_kill" != "x1" && \ 3105 test "x$have_systr_policy_kill" != "x1" && \
diff --git a/sandbox-pledge.c b/sandbox-pledge.c
index 1d3e247d7..d28fc2727 100644
--- a/sandbox-pledge.c
+++ b/sandbox-pledge.c
@@ -17,7 +17,7 @@
17 17
18#include "includes.h" 18#include "includes.h"
19 19
20#ifdef SANDBOX_TAME 20#ifdef SANDBOX_PLEDGE
21 21
22#include <sys/types.h> 22#include <sys/types.h>
23#include <sys/ioctl.h> 23#include <sys/ioctl.h>
@@ -74,4 +74,4 @@ ssh_sandbox_parent_preauth(struct ssh_sandbox *box, pid_t child_pid)
74 /* Nothing to do here */ 74 /* Nothing to do here */
75} 75}
76 76
77#endif /* SANDBOX_TAME */ 77#endif /* SANDBOX_PLEDGE */