configure and have crypt or DES_crypt

Damien Miller djm at mindrot.org
Wed Mar 4 04:14:26 AEDT 2015


On Tue, 3 Mar 2015, Roumen Petrov wrote:

> Hello,
> 
> With current portable master source tree HAVE_CRYPT and HAVE_DES_CRYPT are not
> defined.
> It seems to me this is regression introduced with implementation of configure
> options --with-openssl.
...
> Proposed patch restore previous behavior.

I think that might break some systems that configure --without-openssl,
so it probably better to move the test out of the if-else entirely.

diff --git a/configure.ac b/configure.ac
index 2ef9db6..9a22539 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2710,9 +2710,10 @@ if test "x$openssl" = "xyes" ; then
 	AC_SUBST([COMMENT_OUT_ECC])
 else
 	AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"])
-	AC_CHECK_FUNCS([crypt DES_crypt])
 fi
 
+AC_CHECK_FUNCS([crypt DES_crypt])
+
 AC_CHECK_FUNCS([ \
 	arc4random \
 	arc4random_buf \



More information about the openssh-unix-dev mailing list