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 | |
parent | fdd020e86439afa7f537e2429d29d4b744c94331 (diff) |
unbreak merge botch
-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 8ebdb73df..46c36a767 100644 --- a/sandbox-systrace.c +++ b/sandbox-systrace.c | |||
@@ -15,6 +15,10 @@ | |||
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 | 17 | ||
18 | #include "includes.h" | ||
19 | |||
20 | #ifdef SANDBOX_SYSTRACE | ||
21 | |||
18 | #include <sys/types.h> | 22 | #include <sys/types.h> |
19 | #include <sys/ioctl.h> | 23 | #include <sys/ioctl.h> |
20 | #include <sys/syscall.h> | 24 | #include <sys/syscall.h> |
@@ -91,7 +95,7 @@ struct ssh_sandbox { | |||
91 | }; | 95 | }; |
92 | 96 | ||
93 | struct ssh_sandbox * | 97 | struct ssh_sandbox * |
94 | ssh_sandbox_init(void) | 98 | ssh_sandbox_init(struct monitor *monitor) |
95 | { | 99 | { |
96 | struct ssh_sandbox *box; | 100 | struct ssh_sandbox *box; |
97 | 101 | ||
@@ -208,3 +212,5 @@ ssh_sandbox_parent_preauth(struct ssh_sandbox *box, pid_t child_pid) | |||
208 | { | 212 | { |
209 | ssh_sandbox_parent(box, child_pid, preauth_policy); | 213 | ssh_sandbox_parent(box, child_pid, preauth_policy); |
210 | } | 214 | } |
215 | |||
216 | #endif /* SANDBOX_SYSTRACE */ | ||