Skip to content

Commit

Permalink
Drop HAVE_LDAP_INIT_FD
Browse files Browse the repository at this point in the history
python-ldap requires OpenLDAP 2.4.0 that provides ldap_init_fd.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
  • Loading branch information
Christian Heimes authored and Petr Viktorin committed Jun 18, 2020
1 parent f50b197 commit d45ad6a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 9 deletions.
3 changes: 0 additions & 3 deletions Modules/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
* see https://bugs.openldap.org/show_bug.cgi?id=8671
*/
#include <openldap.h>
#ifndef HAVE_LDAP_INIT_FD
#define HAVE_LDAP_INIT_FD
#endif
#else
/* ldap_init_fd() has been around for a very long time
* SSSD has been defining the function for a while, so it's probably OK.
Expand Down
5 changes: 0 additions & 5 deletions Modules/functions.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ l_ldap_initialize(PyObject *unused, PyObject *args)
return (PyObject *)newLDAPObject(ld);
}

#ifdef HAVE_LDAP_INIT_FD

/* initialize_fd(fileno, url) */

static PyObject *
Expand Down Expand Up @@ -84,7 +82,6 @@ l_ldap_initialize_fd(PyObject *unused, PyObject *args)

return (PyObject *)newLDAPObject(ld);
}
#endif /* HAVE_LDAP_INIT_FD */

/* ldap_str2dn */

Expand Down Expand Up @@ -193,9 +190,7 @@ l_ldap_get_option(PyObject *self, PyObject *args)

static PyMethodDef methods[] = {
{"initialize", (PyCFunction)l_ldap_initialize, METH_VARARGS},
#ifdef HAVE_LDAP_INIT_FD
{"initialize_fd", (PyCFunction)l_ldap_initialize_fd, METH_VARARGS},
#endif
{"str2dn", (PyCFunction)l_ldap_str2dn, METH_VARARGS},
{"set_option", (PyCFunction)l_ldap_set_option, METH_VARARGS},
{"get_option", (PyCFunction)l_ldap_get_option, METH_VARARGS},
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ class OpenLDAP2:
('LDAPMODULE_VERSION', pkginfo.__version__),
('LDAPMODULE_AUTHOR', pkginfo.__author__),
('LDAPMODULE_LICENSE', pkginfo.__license__),
('HAVE_LDAP_INIT_FD', None),
]
),
],
Expand Down

0 comments on commit d45ad6a

Please sign in to comment.