Skip to content

Commit

Permalink
- (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so test
Browse files Browse the repository at this point in the history
   against the correct thing.
  • Loading branch information
djmdjm committed Jan 25, 2014
1 parent c96d853 commit 603b8f4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
sys/capability.h exists and cap_rights_limit is in libc. Fixes
build on FreeBSD9x which provides the header but not the libc
support.
- (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so test
against the correct thing.

20130124
- (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Make
Expand Down
12 changes: 6 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.561 2014/01/25 02:12:29 djm Exp $
# $Id: configure.ac,v 1.562 2014/01/25 02:16:59 djm Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
Expand All @@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

AC_INIT([OpenSSH], [Portable], [[email protected]])
AC_REVISION($Revision: 1.561 $)
AC_REVISION($Revision: 1.562 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])

Expand Down Expand Up @@ -3033,11 +3033,11 @@ elif test "x$sandbox_arg" = "xseccomp_filter" || \
AC_DEFINE([SANDBOX_SECCOMP_FILTER], [1], [Sandbox using seccomp filter])
elif test "x$sandbox_arg" = "xcapsicum" || \
( test -z "$sandbox_arg" && \
test "x$ac_cv_header_sys_capability_h" = "x1" && \
test "x$ac_cv_func_cap_rights_limit" = "x1") ; then
test "x$ac_cv_header_sys_capability_h" != "x1" && \
test "x$ac_cv_header_sys_capability_h" = "xyes" && \
test "x$ac_cv_func_cap_rights_limit" = "xyes") ; then
test "x$ac_cv_header_sys_capability_h" != "xyes" && \
AC_MSG_ERROR([capsicum sandbox requires sys/capability.h header])
test "x$ac_cv_func_cap_rights_limit" != "x1" && \
test "x$ac_cv_func_cap_rights_limit" != "xyes" && \
AC_MSG_ERROR([capsicum sandbox requires cap_rights_limit function])
SANDBOX_STYLE="capsicum"
AC_DEFINE([SANDBOX_CAPSICUM], [1], [Sandbox using capsicum])
Expand Down

0 comments on commit 603b8f4

Please sign in to comment.