[php-src] master: Update ext/ldap sanity check (#13946)
| From: | Peter Kokot via GitHub | Date: | Fri, 12 Apr 2024 08:20:32 +0000 |
| Subject: | [php-src] master: Update ext/ldap sanity check (#13946) | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128080@lists.php.net to get a copy of this message | ||
Author: Peter Kokot (petk)
Committer: GitHub (web-flow)
Pusher: petk
Date: 2024-04-12T10:20:26+02:00
Commit: https://github.com/php/php-src/commit/a6fdd8fb195d2a3f8c5ad6d7539d66ae15057394
Raw diff: https://github.com/php/php-src/commit/a6fdd8fb195d2a3f8c5ad6d7539d66ae15057394.diff
Update ext/ldap sanity check (#13946)
The ldap_bind_s() has been deprecated and isn't used in the code in
favor of ldap_sasl_bind_s(). PHP falls back to deprecated
ldap_simple_bind_s() if for some reason ldap_sasl_bind_s() isn't
available and this check likewise.
Changed paths:
M ext/ldap/config.m4
Diff:
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 89c4b1953195e..76c097a17b8a0 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -124,9 +124,9 @@ if test "$PHP_LDAP" != "no"; then
fi
dnl Sanity check
- AC_CHECK_FUNC(ldap_bind_s, [], [
- AC_MSG_ERROR([LDAP build check failed. Please check config.log for more information.])
- ])
+ AC_CHECK_FUNC([ldap_sasl_bind_s],,
+ [AC_CHECK_FUNC([ldap_simple_bind_s],,
+ [AC_MSG_ERROR([LDAP build check failed. Please check config.log for details.])])])
dnl Restore original values
CPPFLAGS=$_SAVE_CPPFLAGS