]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
unbreak merge botch
authorDamien Miller <djm@mindrot.org>
Tue, 6 Oct 2015 01:33:05 +0000 (18:33 -0700)
committerDamien Miller <djm@mindrot.org>
Tue, 6 Oct 2015 01:33:05 +0000 (18:33 -0700)
sandbox-systrace.c

index 8ebdb73df4cbaefd44c179b1ae52887ffaa372c6..46c36a767762de70295865b37b42457b63b8b0d4 100644 (file)
  * 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 */