Call for testing: OpenSSH 8.9

[Darren Tucker]

On Fri, Feb 18, 2022 at 12:23:35AM +0100, Thorsten Glaser wrote:
> On Fri, 18 Feb 2022, Damien Miller wrote:
> 
> > Darren, is there any chance of making an Alpine VM to test against?
> 
> If it helps, I can reproduce this on Debian, with musl-tools installed.

Thanks, that does help.  I'll add that to the github CI test configs.

Looks like it's actually poll vs select.

$ autoreconf
$ CC=musl-gcc ./configure --without-openssl --without-zlib --with-cflags=-DBROKEN_POLL

with this patch passes.  Might be the pfd.fd=-1 for marking FDs as
unused that's causing it to fail?

[...]

> (Why the configure script doesn't configure the tests so
> they run only those that can actually be run without OpenSSL
> is beyond me???)

Both those tests and the Makefile predate --without-openssl by a
considerable time.  Right now regress/Makefile is not processed by
configure and changing that never made it to the top of a to-do list.

diff --git a/configure.ac b/configure.ac
index a22eb444..eb2872c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,6 +456,7 @@ AC_CHECK_HEADERS([ \
 	sys/mman.h \
 	sys/label.h \
 	sys/ndir.h \
+	sys/param.h \
 	sys/poll.h \
 	sys/prctl.h \
 	sys/procctl.h \
diff --git a/openbsd-compat/bsd-poll.c b/openbsd-compat/bsd-poll.c
index f8b427fc..781ee978 100644
--- a/openbsd-compat/bsd-poll.c
+++ b/openbsd-compat/bsd-poll.c
@@ -19,6 +19,9 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
diff --git a/openbsd-compat/bsd-poll.h b/openbsd-compat/bsd-poll.h
index fb99b66f..586647ee 100644
--- a/openbsd-compat/bsd-poll.h
+++ b/openbsd-compat/bsd-poll.h
@@ -33,8 +33,7 @@
 #include <sys/types.h>
 #ifdef HAVE_POLL_H
 # include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
+#elif HAVE_SYS_POLL_H
 # include <sys/poll.h>
 #endif
 

-- 
Darren Tucker (dtucker at dtucker.net)
GPG key 11EAA6FA / A86E 3E07 5B19 5880 E860  37F4 9357 ECEF 11EA A6FA (new)
    Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.