[openssh-commits] [openssh] 01/01: unbreak merge botch

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 0dc74512bdb105b048883f07de538b37e5e024d4
Author: Damien Miller <djm at mindrot.org>
Date:   Mon Oct 5 18:33:05 2015 -0700

    unbreak merge botch
---
 sandbox-systrace.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sandbox-systrace.c b/sandbox-systrace.c
index 8ebdb73..46c36a7 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 */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.