ext/ldap: Allow default host from ldap.conf to work. #2536
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes an regression introduced in e7af0fe. Previously, calling
ldap_connect()
with no parameters would passNULL
toldap_init()
, which causes it to use the default host specified in/etc/ldap/ldap.conf
(on Ubuntu).When the code changed to use
ldap_initialize()
, it initialized a uri, even if there were no parameters passed toldap_connect()
. Because of this, there's no way to pass aNULL
intoldap_initialize()
, making it impossible to use the default uri from ldap.conf.This commit bypasses the uri creation when there is no host argument, passing on a
NULL
toldap_initialize()
which restores the old PHP 5.5 behavior.