summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sandbox-systrace.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dbbcbad4..7053d72f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 add the streamlocal* options to ssh's -o list; millert says they're 19 add the streamlocal* options to ssh's -o list; millert says they're
20 irrelevant for scp/sftp; 20 irrelevant for scp/sftp;
21 ok markus millert 21 ok markus millert
22 - djm@cvs.openbsd.org 2014/07/17 00:10:56
23 [sandbox-systrace.c]
24 ifdef SYS_sendsyslog so this will compile without patching on -stable
22 25
2320140717 2620140717
24 - (djm) [digest-openssl.c] Preserve array order when disabling digests. 27 - (djm) [digest-openssl.c] Preserve array order when disabling digests.
diff --git a/sandbox-systrace.c b/sandbox-systrace.c
index a74dc4f9d..aaa3d8f0a 100644
--- a/sandbox-systrace.c
+++ b/sandbox-systrace.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sandbox-systrace.c,v 1.12 2014/07/11 08:09:54 deraadt 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 *
@@ -60,7 +60,9 @@ static const struct sandbox_policy preauth_policy[] = {
60 { SYS___sysctl, SYSTR_POLICY_PERMIT }, 60 { SYS___sysctl, SYSTR_POLICY_PERMIT },
61#endif 61#endif
62 62
63// { SYS_sendsyslog, SYSTR_POLICY_PERMIT }, 63#ifdef SYS_sendsyslog
64 { SYS_sendsyslog, SYSTR_POLICY_PERMIT },
65#endif
64 { SYS_close, SYSTR_POLICY_PERMIT }, 66 { SYS_close, SYSTR_POLICY_PERMIT },
65 { SYS_exit, SYSTR_POLICY_PERMIT }, 67 { SYS_exit, SYSTR_POLICY_PERMIT },
66 { SYS_getpid, SYSTR_POLICY_PERMIT }, 68 { SYS_getpid, SYSTR_POLICY_PERMIT },