summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sandbox-systrace.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ccc9407ed..50e549ece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120140702
2 - OpenBSD CVS Sync
3 - deraadt@cvs.openbsd.org 2014/06/13 08:26:29
4 [sandbox-systrace.c]
5 permit SYS_getentropy
6 from matthew
7
120140618 820140618
2 - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare 9 - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare
3 10
diff --git a/sandbox-systrace.c b/sandbox-systrace.c
index 6706c9a80..c48f621f7 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.10 2014/06/13 08:26:29 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 2011 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
4 * 4 *
@@ -56,6 +56,7 @@ static const struct sandbox_policy preauth_policy[] = {
56 { SYS_close, SYSTR_POLICY_PERMIT }, 56 { SYS_close, SYSTR_POLICY_PERMIT },
57 { SYS_exit, SYSTR_POLICY_PERMIT }, 57 { SYS_exit, SYSTR_POLICY_PERMIT },
58 { SYS_getpid, SYSTR_POLICY_PERMIT }, 58 { SYS_getpid, SYSTR_POLICY_PERMIT },
59 { SYS_getentropy, SYSTR_POLICY_PERMIT },
59 { SYS_gettimeofday, SYSTR_POLICY_PERMIT }, 60 { SYS_gettimeofday, SYSTR_POLICY_PERMIT },
60 { SYS_clock_gettime, SYSTR_POLICY_PERMIT }, 61 { SYS_clock_gettime, SYSTR_POLICY_PERMIT },
61 { SYS_madvise, SYSTR_POLICY_PERMIT }, 62 { SYS_madvise, SYSTR_POLICY_PERMIT },