diff options
author | Damien Miller <djm@mindrot.org> | 2015-10-05 18:33:05 -0700 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-10-05 18:33:05 -0700 |
commit | 0dc74512bdb105b048883f07de538b37e5e024d4 (patch) | |
tree | 841d34b9cb9610d282af0c05989125d6cd804bf1 /sandbox-systrace.c | |
parent | fdd020e86439afa7f537e2429d29d4b744c94331 (diff) | |
download | openssh-git-0dc74512bdb105b048883f07de538b37e5e024d4.tar.gz |
unbreak merge botch
Diffstat (limited to 'sandbox-systrace.c')
-rw-r--r-- | sandbox-systrace.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sandbox-systrace.c b/sandbox-systrace.c index 8ebdb73d..46c36a76 100644 --- a/sandbox-systrace.c +++ b/sandbox-systrace.c @@ -15,6 +15,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "includes.h" + +#ifdef SANDBOX_SYSTRACE + #include <sys/types.h> #include <sys/ioctl.h> #include <sys/syscall.h> @@ -91,7 +95,7 @@ struct ssh_sandbox { }; struct ssh_sandbox * -ssh_sandbox_init(void) +ssh_sandbox_init(struct monitor *monitor) { struct ssh_sandbox *box; @@ -208,3 +212,5 @@ ssh_sandbox_parent_preauth(struct ssh_sandbox *box, pid_t child_pid) { ssh_sandbox_parent(box, child_pid, preauth_policy); } + +#endif /* SANDBOX_SYSTRACE */ |