[openssh-commits] [openssh] 01/02: Move checks for pollfd.fd and nfds_t.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 6208d611520f9ea94d5369f9da404b709930029d
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Sun Jul 3 17:54:49 2022 +1000

    Move checks for pollfd.fd and nfds_t.
    
    Move the checks for struct pollfd.fd and nfds_t to before the sandboxing
    checks.  This groups all the sandbox checks together so we can skip them
    all when sandboxing is disabled.
---
 configure.ac | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0aba3709..d371d408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3537,6 +3537,26 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 )
 fi
 
+AC_CHECK_MEMBERS([struct pollfd.fd], [], [], [[
+#include <sys/types.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
+]])
+
+AC_CHECK_TYPES([nfds_t], , , [
+#include <sys/types.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
+])
+
 # Decide which sandbox style to use
 sandbox_arg=""
 AC_ARG_WITH([sandbox],
@@ -3614,26 +3634,6 @@ else
     )
 fi
 
-AC_CHECK_MEMBERS([struct pollfd.fd], [], [], [[
-#include <sys/types.h>
-#ifdef HAVE_POLL_H
-#include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#endif
-]])
-
-AC_CHECK_TYPES([nfds_t], , , [
-#include <sys/types.h>
-#ifdef HAVE_POLL_H
-#include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#endif
-])
-
 AC_MSG_CHECKING([if setrlimit(RLIMIT_NOFILE,{0,0}) works])
 AC_RUN_IFELSE(
 	[AC_LANG_PROGRAM([[

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.