tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skip select+rlimit check if sandboxing is disabled 

It's not needed in that case, and the test can fail when being built
with some compiler memory sanitizer flags.  bz#3441
This commit is contained in:
Darren Tucker 2022-07-01 13:55:19 +10:00
parent 4be7184ebe
commit 32e82a392d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -3552,10 +3552,13 @@ AC_ARG_WITH([sandbox],
# POSIX specifies that poll() "shall fail with EINVAL if the nfds argument # POSIX specifies that poll() "shall fail with EINVAL if the nfds argument
# is greater than OPEN_MAX". On some platforms that includes implementions # is greater than OPEN_MAX". On some platforms that includes implementions
# ofselect in userspace on top of poll() so check both work with rlimit NOFILES # of select in userspace on top of poll() so check both work with rlimit
# so check that both work before enabling the rlimit sandbox. # NOFILES so check that both work before enabling the rlimit sandbox.
AC_MSG_CHECKING([if select and/or poll works with descriptor rlimit]) AC_MSG_CHECKING([if select and/or poll works with descriptor rlimit])
AC_RUN_IFELSE( if test "x$sandbox_arg" = "xno"; then
AC_MSG_RESULT([sandboxing disabled, skipping])
else
AC_RUN_IFELSE(
[AC_LANG_PROGRAM([[ [AC_LANG_PROGRAM([[
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
@ -3608,7 +3611,8 @@ AC_RUN_IFELSE(
select_works_with_rlimit=no], select_works_with_rlimit=no],
[AC_MSG_WARN([cross compiling: assuming no]) [AC_MSG_WARN([cross compiling: assuming no])
select_works_with_rlimit=no] select_works_with_rlimit=no]
) )
fi
AC_CHECK_MEMBERS([struct pollfd.fd], [], [], [[ AC_CHECK_MEMBERS([struct pollfd.fd], [], [], [[
#include <sys/types.h> #include <sys/types.h>