diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
commit | c6a2c0334e45419875687d250aed9bea78480f2e (patch) | |
tree | d8f01bef9f3921fa1ca7592a19474be9c8349f76 /sandbox-rlimit.c | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) | |
parent | 8b13b5bdc4f19bd52ee673104d66b71c21153b96 (diff) |
merge 6.1p1
Diffstat (limited to 'sandbox-rlimit.c')
-rw-r--r-- | sandbox-rlimit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sandbox-rlimit.c b/sandbox-rlimit.c index 761e9284f..a00386337 100644 --- a/sandbox-rlimit.c +++ b/sandbox-rlimit.c | |||
@@ -64,9 +64,11 @@ ssh_sandbox_child(struct ssh_sandbox *box) | |||
64 | 64 | ||
65 | rl_zero.rlim_cur = rl_zero.rlim_max = 0; | 65 | rl_zero.rlim_cur = rl_zero.rlim_max = 0; |
66 | 66 | ||
67 | #ifndef SANDBOX_SKIP_RLIMIT_FSIZE | ||
67 | if (setrlimit(RLIMIT_FSIZE, &rl_zero) == -1) | 68 | if (setrlimit(RLIMIT_FSIZE, &rl_zero) == -1) |
68 | fatal("%s: setrlimit(RLIMIT_FSIZE, { 0, 0 }): %s", | 69 | fatal("%s: setrlimit(RLIMIT_FSIZE, { 0, 0 }): %s", |
69 | __func__, strerror(errno)); | 70 | __func__, strerror(errno)); |
71 | #endif | ||
70 | if (setrlimit(RLIMIT_NOFILE, &rl_zero) == -1) | 72 | if (setrlimit(RLIMIT_NOFILE, &rl_zero) == -1) |
71 | fatal("%s: setrlimit(RLIMIT_NOFILE, { 0, 0 }): %s", | 73 | fatal("%s: setrlimit(RLIMIT_NOFILE, { 0, 0 }): %s", |
72 | __func__, strerror(errno)); | 74 | __func__, strerror(errno)); |