From 5e493a972d011bcd81c9400b9805c06a6e5a8374 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 3 Oct 2023 11:57:33 +0000 Subject: [PATCH] curl: re-enable LDAP/LDAP on non-Windows We disabled it partly because in macOS builds LDAPS was not enable in CMake builds. Also wrongly assumed this also applies to autotools builds, but it turned out to be an issue with CMake builds and fixed here: https://github.com/curl/curl/pull/12006 Try re-enabling to see how it goes. The other reason for disabling it was that Apple deprecated the LDAP API in 10.10. We must build for Mavericks to avoid these warnings. First, let's try without changing the target. --- curl-autotools.sh | 5 ----- curl-cmake.sh | 5 ----- 2 files changed, 10 deletions(-) diff --git a/curl-autotools.sh b/curl-autotools.sh index 6d032b42d..2e0c569f7 100755 --- a/curl-autotools.sh +++ b/curl-autotools.sh @@ -106,11 +106,6 @@ _VER="$1" options="${options} --enable-imap --enable-pop3 --enable-smtp" if [ "${_OS}" = 'win' ]; then options="${options} --enable-ldap --enable-ldaps --with-ldap-lib=wldap32" - else - # ldap is auto-detected on mac, but without ldaps. Disable it - # rather than offering an insecure-only solution. In certain configs - # it also results in 'deprecated in macOS 10.11' compiler output. - options="${options} --disable-ldap --disable-ldaps" fi fi diff --git a/curl-cmake.sh b/curl-cmake.sh index 43d2ab7cf..c129423f6 100755 --- a/curl-cmake.sh +++ b/curl-cmake.sh @@ -101,11 +101,6 @@ _VER="$1" [ "${_BRANCH#*noftp*}" != "${_BRANCH}" ] && options="${options} -DCURL_DISABLE_FTP=ON" if [ "${_OS}" = 'win' ]; then LIBS="${LIBS} -lwldap32" - else - # ldap is auto-detected on mac, but without ldaps. Disable it - # rather than offering an insecure-only solution. In certain configs - # it also results in 'deprecated in macOS 10.11' compiler output. - options="${options} -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON" fi fi