diff options
author | Damien Miller <djm@mindrot.org> | 2011-06-23 19:45:51 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-06-23 19:45:51 +1000 |
commit | dcbd41e7aff4c7ef10dd13d8833a8cba82f9a794 (patch) | |
tree | e4201b8d9d2ad65fb70c34b9de1265702ef26806 | |
parent | 80b62e37384b14187b6d9fa5eb3cf6bf04a3cf3a (diff) |
- 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 @@ | |||
27 | [channels.c channels.h clientloop.c clientloop.h mux.c ssh.c] | 27 | [channels.c channels.h clientloop.c clientloop.h mux.c ssh.c] |
28 | hook up a channel confirm callback to warn the user then requested X11 | 28 | hook up a channel confirm callback to warn the user then requested X11 |
29 | forwarding was refused by the server; ok markus@ | 29 | forwarding was refused by the server; ok markus@ |
30 | - djm@cvs.openbsd.org 2011/06/23 09:34:13 | ||
31 | [sshd.c ssh-sandbox.h sandbox.h sandbox-rlimit.c sandbox-systrace.c] | ||
32 | [sandbox-null.c] | ||
33 | rename sandbox.h => ssh-sandbox.h to make things easier for portable | ||
30 | - (djm) [sandbox-null.c] Dummy sandbox for platforms that don't support | 34 | - (djm) [sandbox-null.c] Dummy sandbox for platforms that don't support |
31 | setrlimit(2) | 35 | setrlimit(2) |
32 | 36 | ||
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 @@ | |||
1 | /* $OpenBSD$ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> |
3 | * | 4 | * |
@@ -28,7 +29,7 @@ | |||
28 | #include <unistd.h> | 29 | #include <unistd.h> |
29 | 30 | ||
30 | #include "log.h" | 31 | #include "log.h" |
31 | #include "sandbox.h" | 32 | #include "ssh-sandbox.h" |
32 | #include "xmalloc.h" | 33 | #include "xmalloc.h" |
33 | 34 | ||
34 | /* dummy sandbox */ | 35 | /* 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 @@ | |||
1 | /* $OpenBSD: sandbox-rlimit.c,v 1.3 2011/06/23 09:34:13 djm Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> |
3 | * | 4 | * |
@@ -31,7 +32,7 @@ | |||
31 | #include <unistd.h> | 32 | #include <unistd.h> |
32 | 33 | ||
33 | #include "log.h" | 34 | #include "log.h" |
34 | #include "sandbox.h" | 35 | #include "ssh-sandbox.h" |
35 | #include "xmalloc.h" | 36 | #include "xmalloc.h" |
36 | 37 | ||
37 | /* Minimal sandbox that sets zero nfiles, nprocs and filesize rlimits */ | 38 | /* 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 @@ | |||
1 | /* $OpenBSD: sandbox-systrace.c,v 1.3 2011/06/23 09:34:13 djm Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> |
3 | * | 4 | * |
@@ -37,7 +38,7 @@ | |||
37 | 38 | ||
38 | #include "atomicio.h" | 39 | #include "atomicio.h" |
39 | #include "log.h" | 40 | #include "log.h" |
40 | #include "sandbox.h" | 41 | #include "ssh-sandbox.h" |
41 | #include "xmalloc.h" | 42 | #include "xmalloc.h" |
42 | 43 | ||
43 | static const int preauth_policy[] = { | 44 | 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 @@ | |||
1 | /* $OpenBSD: sandbox.h,v 1.2 2011/06/22 22:14:05 djm Exp $ */ | 1 | /* $OpenBSD: ssh-sandbox.h,v 1.1 2011/06/23 09:34:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> |
4 | * | 4 | * |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.384 2011/06/22 21:57:01 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.385 2011/06/23 09:34:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -118,7 +118,7 @@ | |||
118 | #endif | 118 | #endif |
119 | #include "monitor_wrap.h" | 119 | #include "monitor_wrap.h" |
120 | #include "roaming.h" | 120 | #include "roaming.h" |
121 | #include "sandbox.h" | 121 | #include "ssh-sandbox.h" |
122 | #include "version.h" | 122 | #include "version.h" |
123 | 123 | ||
124 | #ifdef LIBWRAP | 124 | #ifdef LIBWRAP |