From f616f1c994eba5cf0c99d33674e483aa1f43d756 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 23 Jun 2011 09:34:14 +0000 Subject: rename sandbox.h => ssh-sandbox.h to make things easier for portable --- usr.bin/ssh/sandbox-rlimit.c | 4 ++-- usr.bin/ssh/sandbox-systrace.c | 4 ++-- usr.bin/ssh/sandbox.h | 23 ----------------------- usr.bin/ssh/ssh-sandbox.h | 23 +++++++++++++++++++++++ usr.bin/ssh/sshd.c | 4 ++-- 5 files changed, 29 insertions(+), 29 deletions(-) delete mode 100755 usr.bin/ssh/sandbox.h create mode 100755 usr.bin/ssh/ssh-sandbox.h (limited to 'usr.bin') 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 * @@ -28,7 +28,7 @@ #include #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 * @@ -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/sandbox.h deleted file mode 100755 index 5fe30644d63..00000000000 --- a/usr.bin/ssh/sandbox.h +++ /dev/null @@ -1,23 +0,0 @@ -/* $OpenBSD: sandbox.h,v 1.2 2011/06/22 22:14:05 djm Exp $ */ -/* - * Copyright (c) 2011 Damien Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -struct ssh_sandbox; - -struct ssh_sandbox *ssh_sandbox_init(void); -void ssh_sandbox_child(struct ssh_sandbox *); -void ssh_sandbox_parent_finish(struct ssh_sandbox *); -void ssh_sandbox_parent_preauth(struct ssh_sandbox *, pid_t); diff --git a/usr.bin/ssh/ssh-sandbox.h b/usr.bin/ssh/ssh-sandbox.h new file mode 100755 index 00000000000..dfecd5aa00a --- /dev/null +++ b/usr.bin/ssh/ssh-sandbox.h @@ -0,0 +1,23 @@ +/* $OpenBSD: ssh-sandbox.h,v 1.1 2011/06/23 09:34:13 djm Exp $ */ +/* + * Copyright (c) 2011 Damien Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +struct ssh_sandbox; + +struct ssh_sandbox *ssh_sandbox_init(void); +void ssh_sandbox_child(struct ssh_sandbox *); +void ssh_sandbox_parent_finish(struct ssh_sandbox *); +void ssh_sandbox_parent_preauth(struct ssh_sandbox *, pid_t); 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 * Copyright (c) 1995 Tatu Ylonen , 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 -- cgit v1.2.3