Fix macOS SDK builds without ldap_init_fd #360
Conversation
|
Could you also document when the functionality is available? |
I would like to but I don't know. OpenLDAP 2.4.28 has |
|
From the patch, I gather that on a Mac, you won't get fileno support even if you compile OpenLDAP 2.4.28 yourself. |
2.4.28 was released over 8 years ago. I don't we have to care about ancient versions except for Apple system builds. I'm also open to better ways to detect system libldap on macOS. I don't have access to macOS to investigate the issue. |
|
I'm OK with the patch itself. I just think it needs a note in the documentation that says when the feature is available. From the current text, it seems that fileno is always usable. Also, you've now rebased onto master, which I don't understand. Shouldn't this go into 3.3.1? |
I have updated documentation to mention
The fix should land in master and 3.3.1. New features land in master and then are back-ported to bug fix branches. |
That way makes it harder to merge. It is the CPython workflow, but this repo doesn't have Miss Islington like CPython. |
macOS system libldap 2.4.28 does not have ldap_init_fd symbol. Disable initialize_fd when Apple libldap 2.4.28 is detected. Also run some macOS tests on Travis CI. Since the SDK does not ship slapd, testing is rather limited. Fixes: python-ldap#359 Signed-off-by: Christian Heimes <cheimes@redhat.com>
I use the same workflow in all projects. Patches land in master first and then get backported to maintenance branches. The patch would have conflicted either way. To make it easier for you I have created a backport branch, #363 |
macOS system libldap 2.4.28 does not have ldap_init_fd symbol. Disable
initialize_fd when Apple libldap 2.4.28 is detected.
Also run some macOS tests on Travis CI. Since the SDK does not ship
slapd, testing is rather limited.
Fixes: #359
Signed-off-by: Christian Heimes cheimes@redhat.com