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.

(cherry picked from commit 49e523e56f81f255d792c5ae2ff24cedc3cbc3a0)

diff --git a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c
index 543a95d7a852277f1bb7443187548f565395df82..681c5995ba8f3a529e1588245aea7eeb6c2e925b 100644 (file)
--- 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,8 @@ 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 +732,8 @@ 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 +1119,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