Skip to content

PHPC-1185: Revert GSSAPI support and fix sasl_client_done check #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2018

Conversation

jmikola
Copy link
Member

@jmikola jmikola commented May 17, 2018

https://jira.mongodb.org/browse/PHPC-1185
https://jira.mongodb.org/browse/PHPC-1142

Reverts support for building with GSS framework on macOS or krb5-gssapi, as libmongoc doesn't support those. Additionally, this fixes an issue with the check for sasl_client_done.

PHP_ADD_FRAMEWORK([GSS])
fi
PHP_MONGODB_SASL="gssapi"
])
Copy link
Member Author

@jmikola jmikola May 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kvwalker found another bug with the original implementation. Although this added the GSS framework on macOS, it didn't stop the subsequent PKG_CHECK_MODULES check for krb5-gssapi and still resulted in an error if that library wasn't found. Had we kept this, we would want to ensure that the AS_IF([test "$PHP_MONGODB_SASL" = "gssapi" -o "$PHP_MONGODB_SASL" = "auto"],[ block later on never runs.

This is a moot point since we're deleting the code, but I wanted to make a note of it for future reference.

@jmikola
Copy link
Member Author

jmikola commented May 21, 2018

Note: Changes in #841 should address Windows builds.

Copy link
Contributor

@derickr derickr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AppVeyor really doesn't like this one either. Perhaps it needs the rebase for #841 too?

jmikola added 2 commits May 22, 2018 16:25
libmongoc does not actually support GSSAPI (CDRIVER-2170), so we should not allow building with it. This also reverts preference for the GSS framework on macOS (PHPC-1142).
The check for sasl_client_done was inadvertently removed by aab92e1. This ensures that we check for the symbol regardless of whether SASL was found with pgk-config or PHP_CHECK_LIBRARY.
@jmikola jmikola merged commit 66bdd83 into master May 22, 2018
jmikola added a commit that referenced this pull request May 22, 2018
@jmikola jmikola deleted the phpc-1185 branch May 22, 2018 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants