summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/ssh/sandbox-rlimit.c4
-rw-r--r--usr.bin/ssh/sandbox-systrace.c4
-rwxr-xr-xusr.bin/ssh/ssh-sandbox.h (renamed from usr.bin/ssh/sandbox.h)2
-rw-r--r--usr.bin/ssh/sshd.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/ssh/sandbox-rlimit.c b/usr.bin/ssh/sandbox-rlimit.c
index 3eb5724a067..794689623c0 100644
--- a/usr.bin/ssh/sandbox-rlimit.c
+++ b/usr.bin/ssh/sandbox-rlimit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sandbox-rlimit.c,v 1.2 2011/06/22 22:14:04 djm Exp $ */
+/* $OpenBSD: sandbox-rlimit.c,v 1.3 2011/06/23 09:34:13 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller <djm@mindrot.org>
*
@@ -28,7 +28,7 @@
#include <unistd.h>
#include "log.h"
-#include "sandbox.h"
+#include "ssh-sandbox.h"
#include "xmalloc.h"
/* Minimal sandbox that sets zero nfiles, nprocs and filesize rlimits */
diff --git a/usr.bin/ssh/sandbox-systrace.c b/usr.bin/ssh/sandbox-systrace.c
index 7f0cfc2a4c1..76e441ee3ce 100644
--- a/usr.bin/ssh/sandbox-systrace.c
+++ b/usr.bin/ssh/sandbox-systrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sandbox-systrace.c,v 1.2 2011/06/22 22:14:05 djm Exp $ */
+/* $OpenBSD: sandbox-systrace.c,v 1.3 2011/06/23 09:34:13 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller <djm@mindrot.org>
*
@@ -34,7 +34,7 @@
#include "atomicio.h"
#include "log.h"
-#include "sandbox.h"
+#include "ssh-sandbox.h"
#include "xmalloc.h"
static const int preauth_policy[] = {
diff --git a/usr.bin/ssh/sandbox.h b/usr.bin/ssh/ssh-sandbox.h
index 5fe30644d63..dfecd5aa00a 100755
--- a/usr.bin/ssh/sandbox.h
+++ b/usr.bin/ssh/ssh-sandbox.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sandbox.h,v 1.2 2011/06/22 22:14:05 djm Exp $ */
+/* $OpenBSD: ssh-sandbox.h,v 1.1 2011/06/23 09:34:13 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller <djm@mindrot.org>
*
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 4cc6a6f2296..7c186664f5d 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.384 2011/06/22 21:57:01 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.385 2011/06/23 09:34:13 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -102,7 +102,7 @@
#endif
#include "monitor_wrap.h"
#include "roaming.h"
-#include "sandbox.h"
+#include "ssh-sandbox.h"
#include "version.h"
#ifdef LIBWRAP