From e6ed26c98ebac9313ce531a366f96ff9912e84af Mon Sep 17 00:00:00 2001 From: Petr Mensik Date: Wed, 22 Dec 2021 13:36:39 +0100 Subject: [PATCH 1/2] Avoid conflict with ldap_connect function of openldap ldap_connect is defined by OpenLDAP 2.6. Compiler complains there are conflicting declarations. Use dlz_ldap prefix instead of ldap to avoid conflict. --- contrib/dlz/modules/ldap/dlz_ldap_dynamic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c index 543a95d..317a691 100644 --- a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c +++ b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c @@ -193,7 +193,7 @@ cleanup: /*% Connects / reconnects to LDAP server */ static isc_result_t -ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) { +dlz_ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) { isc_result_t result; int ldap_result; @@ -700,7 +700,7 @@ ldap_get_results(const char *zone, const char *record, const char *client, db->log(ISC_LOG_INFO, "LDAP driver attempting to " "re-connect"); - result = ldap_connect((ldap_instance_t *)dbdata, dbi); + result = dlz_ldap_connect((ldap_instance_t *)dbdata, dbi); if (result != ISC_R_SUCCESS) { result = ISC_R_FAILURE; continue; @@ -731,7 +731,7 @@ ldap_get_results(const char *zone, const char *record, const char *client, case LDAP_SERVER_DOWN: db->log(ISC_LOG_INFO, "LDAP driver attempting to " "re-connect"); - result = ldap_connect((ldap_instance_t *)dbdata, dbi); + result = dlz_ldap_connect((ldap_instance_t *)dbdata, dbi); if (result != ISC_R_SUCCESS) { result = ISC_R_FAILURE; } @@ -1117,7 +1117,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ldap->db = dbi; #endif /* if PTHREADS */ /* attempt to connect */ - result = ldap_connect(ldap, dbi); + result = dlz_ldap_connect(ldap, dbi); /* * if db connection cannot be created, log err msg and -- 2.31.1