summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-02 04:47:25 +0200
committerDamien Miller <djm@mindrot.org>2014-07-02 04:47:25 +0200
commit51504ceec627c0ad57b9f75585c7b3d277f326be (patch)
tree0fd73253d77b1902f93e17c534e9118d9d270644
parent - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare (diff)
downloadopenssh-51504ceec627c0ad57b9f75585c7b3d277f326be.tar.xz
openssh-51504ceec627c0ad57b9f75585c7b3d277f326be.zip
- deraadt@cvs.openbsd.org 2014/06/13 08:26:29
[sandbox-systrace.c] permit SYS_getentropy from matthew
-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 @@
+20140702
+ - OpenBSD CVS Sync
+ - deraadt@cvs.openbsd.org 2014/06/13 08:26:29
+ [sandbox-systrace.c]
+ permit SYS_getentropy
+ from matthew
+
20140618
- (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare
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 @@
-/* $OpenBSD: sandbox-systrace.c,v 1.9 2014/01/31 16:39:19 tedu Exp $ */
+/* $OpenBSD: sandbox-systrace.c,v 1.10 2014/06/13 08:26:29 deraadt Exp $ */
/*
* Copyright (c) 2011 Damien Miller <djm@mindrot.org>
*
@@ -56,6 +56,7 @@ static const struct sandbox_policy preauth_policy[] = {
{ SYS_close, SYSTR_POLICY_PERMIT },
{ SYS_exit, SYSTR_POLICY_PERMIT },
{ SYS_getpid, SYSTR_POLICY_PERMIT },
+ { SYS_getentropy, SYSTR_POLICY_PERMIT },
{ SYS_gettimeofday, SYSTR_POLICY_PERMIT },
{ SYS_clock_gettime, SYSTR_POLICY_PERMIT },
{ SYS_madvise, SYSTR_POLICY_PERMIT },