diff options
author | Damien Miller <djm@mindrot.org> | 2014-07-18 15:03:02 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-07-18 15:03:02 +1000 |
commit | 1b83320628cb0733e3688b85bfe4d388a7c51909 (patch) | |
tree | 90c29a8717715047a9a08e6574c06e2e6738dc15 | |
parent | 6d57656331bcd754d912950e4a18ad259d596e61 (diff) | |
download | openssh-git-1b83320628cb0733e3688b85bfe4d388a7c51909.tar.gz |
- djm@cvs.openbsd.org 2014/07/17 00:10:56
[sandbox-systrace.c]
ifdef SYS_sendsyslog so this will compile without patching on -stable
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sandbox-systrace.c | 6 |
2 files changed, 7 insertions, 2 deletions
@@ -19,6 +19,9 @@ add the streamlocal* options to ssh's -o list; millert says they're irrelevant for scp/sftp; ok markus millert + - djm@cvs.openbsd.org 2014/07/17 00:10:56 + [sandbox-systrace.c] + ifdef SYS_sendsyslog so this will compile without patching on -stable 20140717 - (djm) [digest-openssl.c] Preserve array order when disabling digests. diff --git a/sandbox-systrace.c b/sandbox-systrace.c index a74dc4f9..aaa3d8f0 100644 --- a/sandbox-systrace.c +++ b/sandbox-systrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sandbox-systrace.c,v 1.12 2014/07/11 08:09:54 deraadt Exp $ */ +/* $OpenBSD: sandbox-systrace.c,v 1.13 2014/07/17 00:10:56 djm Exp $ */ /* * Copyright (c) 2011 Damien Miller <djm@mindrot.org> * @@ -60,7 +60,9 @@ static const struct sandbox_policy preauth_policy[] = { { SYS___sysctl, SYSTR_POLICY_PERMIT }, #endif -// { SYS_sendsyslog, SYSTR_POLICY_PERMIT }, +#ifdef SYS_sendsyslog + { SYS_sendsyslog, SYSTR_POLICY_PERMIT }, +#endif { SYS_close, SYSTR_POLICY_PERMIT }, { SYS_exit, SYSTR_POLICY_PERMIT }, { SYS_getpid, SYSTR_POLICY_PERMIT }, |