unbreak merge botch

This commit is contained in:
Damien Miller 2015-10-05 18:33:05 -07:00
parent fdd020e864
commit 0dc74512bd
1 changed files with 7 additions and 1 deletions

View File

@ -15,6 +15,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "includes.h"
#ifdef SANDBOX_SYSTRACE
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@ -91,7 +95,7 @@ struct ssh_sandbox {
}; };
struct ssh_sandbox * struct ssh_sandbox *
ssh_sandbox_init(void) ssh_sandbox_init(struct monitor *monitor)
{ {
struct ssh_sandbox *box; 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); ssh_sandbox_parent(box, child_pid, preauth_policy);
} }
#endif /* SANDBOX_SYSTRACE */