ldap: improve detection of Apple LDAP - #19849
Closed
vszakats wants to merge 1 commit into
Closed
Conversation
Replace the `__APPLE__` macro (which can be present also when using an old mainline OpenLDAP while building for an Apple platform) with `LDAP_OPT_X_TLS_PASSPHRASE` which is an Apple-specific macro, merged by Apple in 2007, later adding the comment 'Apple Specific code'. This macro hasn't been retrofitted to OpenLDAP since then, and unlikely to happen in the future. Refs: apple-oss-distributions/OpenLDAP@c4d990a#diff-0f7a5f85bae4de860b70aabf34aa12b0ecc37e748cd96e203e2d8ddb30a207c3R145 apple-oss-distributions/OpenLDAP@49ac28a#diff-0f7a5f85bae4de860b70aabf34aa12b0ecc37e748cd96e203e2d8ddb30a207c3R166 Follow-up to 859ce48 curl#19832
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
When detecting the Apple fork of "legacy" LDAP, replace the
__APPLE__macro (which can be present also when using an old mainline OpenLDAP
while building for an Apple platform) with
LDAP_OPT_X_TLS_PASSPHRASEwhich is an Apple-specific macro, merged by Apple in 2007, later adding
the comment 'Apple Specific code'. This macro hasn't been retrofitted
to OpenLDAP since then, and unlikely to happen in the future.
Refs:
apple-oss-distributions/OpenLDAP@c4d990a#diff-0f7a5f85bae4de860b70aabf34aa12b0ecc37e748cd96e203e2d8ddb30a207c3R145
apple-oss-distributions/OpenLDAP@49ac28a#diff-0f7a5f85bae4de860b70aabf34aa12b0ecc37e748cd96e203e2d8ddb30a207c3R166
Follow-up to 859ce48 #19832