summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac12
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dc664e57..44e56f4a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 sys/capability.h exists and cap_rights_limit is in libc. Fixes 4 sys/capability.h exists and cap_rights_limit is in libc. Fixes
5 build on FreeBSD9x which provides the header but not the libc 5 build on FreeBSD9x which provides the header but not the libc
6 support. 6 support.
7 - (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so test
8 against the correct thing.
7 9
820130124 1020130124
9 - (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Make 11 - (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Make
diff --git a/configure.ac b/configure.ac
index 6bf30e82c..5e5e4d135 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.561 2014/01/25 02:12:29 djm Exp $ 1# $Id: configure.ac,v 1.562 2014/01/25 02:16:59 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.561 $) 18AC_REVISION($Revision: 1.562 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -3033,11 +3033,11 @@ elif test "x$sandbox_arg" = "xseccomp_filter" || \
3033 AC_DEFINE([SANDBOX_SECCOMP_FILTER], [1], [Sandbox using seccomp filter]) 3033 AC_DEFINE([SANDBOX_SECCOMP_FILTER], [1], [Sandbox using seccomp filter])
3034elif test "x$sandbox_arg" = "xcapsicum" || \ 3034elif test "x$sandbox_arg" = "xcapsicum" || \
3035 ( test -z "$sandbox_arg" && \ 3035 ( test -z "$sandbox_arg" && \
3036 test "x$ac_cv_header_sys_capability_h" = "x1" && \ 3036 test "x$ac_cv_header_sys_capability_h" = "xyes" && \
3037 test "x$ac_cv_func_cap_rights_limit" = "x1") ; then 3037 test "x$ac_cv_func_cap_rights_limit" = "xyes") ; then
3038 test "x$ac_cv_header_sys_capability_h" != "x1" && \ 3038 test "x$ac_cv_header_sys_capability_h" != "xyes" && \
3039 AC_MSG_ERROR([capsicum sandbox requires sys/capability.h header]) 3039 AC_MSG_ERROR([capsicum sandbox requires sys/capability.h header])
3040 test "x$ac_cv_func_cap_rights_limit" != "x1" && \ 3040 test "x$ac_cv_func_cap_rights_limit" != "xyes" && \
3041 AC_MSG_ERROR([capsicum sandbox requires cap_rights_limit function]) 3041 AC_MSG_ERROR([capsicum sandbox requires cap_rights_limit function])
3042 SANDBOX_STYLE="capsicum" 3042 SANDBOX_STYLE="capsicum"
3043 AC_DEFINE([SANDBOX_CAPSICUM], [1], [Sandbox using capsicum]) 3043 AC_DEFINE([SANDBOX_CAPSICUM], [1], [Sandbox using capsicum])