diff options
| author | Damien Miller <djm@mindrot.org> | 2011-06-23 11:45:51 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-06-23 11:45:51 +0200 |
| commit | dcbd41e7aff4c7ef10dd13d8833a8cba82f9a794 (patch) | |
| tree | e4201b8d9d2ad65fb70c34b9de1265702ef26806 | |
| parent | - (djm) [sandbox-null.c] Dummy sandbox for platforms that don't support (diff) | |
| download | openssh-dcbd41e7aff4c7ef10dd13d8833a8cba82f9a794.tar.xz openssh-dcbd41e7aff4c7ef10dd13d8833a8cba82f9a794.zip | |
- djm@cvs.openbsd.org 2011/06/23 09:34:13
[sshd.c ssh-sandbox.h sandbox.h sandbox-rlimit.c sandbox-systrace.c]
[sandbox-null.c]
rename sandbox.h => ssh-sandbox.h to make things easier for portable
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sandbox-null.c | 3 | ||||
| -rw-r--r-- | sandbox-rlimit.c | 3 | ||||
| -rw-r--r-- | sandbox-systrace.c | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | ssh-sandbox.h (renamed from sandbox.h) | 2 | ||||
| -rw-r--r-- | sshd.c | 4 |
6 files changed, 13 insertions, 6 deletions
@@ -27,6 +27,10 @@ [channels.c channels.h clientloop.c clientloop.h mux.c ssh.c] hook up a channel confirm callback to warn the user then requested X11 forwarding was refused by the server; ok markus@ + - djm@cvs.openbsd.org 2011/06/23 09:34:13 + [sshd.c ssh-sandbox.h sandbox.h sandbox-rlimit.c sandbox-systrace.c] + [sandbox-null.c] + rename sandbox.h => ssh-sandbox.h to make things easier for portable - (djm) [sandbox-null.c] Dummy sandbox for platforms that don't support setrlimit(2) diff --git a/sandbox-null.c b/sandbox-null.c index eadaee2da..29fa9669f 100644 --- a/sandbox-null.c +++ b/sandbox-null.c @@ -1,3 +1,4 @@ +/* $OpenBSD$ */ /* * Copyright (c) 2011 Damien Miller <djm@mindrot.org> * @@ -28,7 +29,7 @@ #include <unistd.h> #include "log.h" -#include "sandbox.h" +#include "ssh-sandbox.h" #include "xmalloc.h" /* dummy sandbox */ diff --git a/sandbox-rlimit.c b/sandbox-rlimit.c index 4d832fc3d..761e9284f 100644 --- a/sandbox-rlimit.c +++ b/sandbox-rlimit.c @@ -1,3 +1,4 @@ +/* $OpenBSD: sandbox-rlimit.c,v 1.3 2011/06/23 09:34:13 djm Exp $ */ /* * Copyright (c) 2011 Damien Miller <djm@mindrot.org> * @@ -31,7 +32,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/sandbox-systrace.c b/sandbox-systrace.c index 5d0b7fb86..8058b7d40 100644 --- a/sandbox-systrace.c +++ b/sandbox-systrace.c @@ -1,3 +1,4 @@ +/* $OpenBSD: sandbox-systrace.c,v 1.3 2011/06/23 09:34:13 djm Exp $ */ /* * Copyright (c) 2011 Damien Miller <djm@mindrot.org> * @@ -37,7 +38,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/sandbox.h b/ssh-sandbox.h index 5fe30644d..dfecd5aa0 100755..100644 --- a/sandbox.h +++ b/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> * @@ -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 @@ -118,7 +118,7 @@ #endif #include "monitor_wrap.h" #include "roaming.h" -#include "sandbox.h" +#include "ssh-sandbox.h" #include "version.h" #ifdef LIBWRAP |