diff options
author | Colin Watson <cjwatson@debian.org> | 2014-10-07 12:13:50 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-10-07 12:13:50 +0100 |
commit | 487bdb3a5ef6075887b830ccb8a0b14f6da78e93 (patch) | |
tree | a2cff6fec1e6c4b4153a170a3e172cfe6bfdec46 /sandbox-systrace.c | |
parent | 796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 (diff) | |
parent | 28453d58058a4d60c3ebe7d7f0c31a510cbf6158 (diff) |
Import openssh_6.7p1.orig.tar.gz
Diffstat (limited to 'sandbox-systrace.c')
-rw-r--r-- | sandbox-systrace.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sandbox-systrace.c b/sandbox-systrace.c index 6706c9a80..aaa3d8f0a 100644 --- a/sandbox-systrace.c +++ b/sandbox-systrace.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sandbox-systrace.c,v 1.9 2014/01/31 16:39:19 tedu Exp $ */ | 1 | /* $OpenBSD: sandbox-systrace.c,v 1.13 2014/07/17 00:10:56 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> |
4 | * | 4 | * |
@@ -52,7 +52,17 @@ struct sandbox_policy { | |||
52 | static const struct sandbox_policy preauth_policy[] = { | 52 | static const struct sandbox_policy preauth_policy[] = { |
53 | { SYS_open, SYSTR_POLICY_NEVER }, | 53 | { SYS_open, SYSTR_POLICY_NEVER }, |
54 | 54 | ||
55 | #ifdef SYS_getentropy | ||
56 | /* OpenBSD 5.6 and newer use getentropy(2) to seed arc4random(3). */ | ||
57 | { SYS_getentropy, SYSTR_POLICY_PERMIT }, | ||
58 | #else | ||
59 | /* Previous releases used sysctl(3)'s kern.arnd variable. */ | ||
55 | { SYS___sysctl, SYSTR_POLICY_PERMIT }, | 60 | { SYS___sysctl, SYSTR_POLICY_PERMIT }, |
61 | #endif | ||
62 | |||
63 | #ifdef SYS_sendsyslog | ||
64 | { SYS_sendsyslog, SYSTR_POLICY_PERMIT }, | ||
65 | #endif | ||
56 | { SYS_close, SYSTR_POLICY_PERMIT }, | 66 | { SYS_close, SYSTR_POLICY_PERMIT }, |
57 | { SYS_exit, SYSTR_POLICY_PERMIT }, | 67 | { SYS_exit, SYSTR_POLICY_PERMIT }, |
58 | { SYS_getpid, SYSTR_POLICY_PERMIT }, | 68 | { SYS_getpid, SYSTR_POLICY_PERMIT }, |