From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 1 Jul 2022 03:55:19 +0000 (+1000)
Subject: Skip select+rlimit check if sandboxing is disabled
X-Git-Tag: V_9_1_P1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32e82a392d9f263485effdd606ff5862d289a4a0;p=thirdparty%2Fopenssh-portable.git

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
---

diff --git a/configure.ac b/configure.ac
index 1f9d23a30..0aba3709f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3552,10 +3552,13 @@ AC_ARG_WITH([sandbox],
 
 # POSIX specifies that poll() "shall fail with EINVAL if the nfds argument
 # 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
-# so check that both work before enabling the rlimit sandbox.
+# of select in userspace on top of poll() so check both work with rlimit
+# NOFILES so check that both work before enabling the rlimit sandbox.
 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([[
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
@@ -3608,7 +3611,8 @@ AC_RUN_IFELSE(
 	 select_works_with_rlimit=no],
 	[AC_MSG_WARN([cross compiling: assuming no])
 	 select_works_with_rlimit=no]
-)
+    )
+fi
 
 AC_CHECK_MEMBERS([struct pollfd.fd], [], [], [[
 #include <sys/types.h>