Replace APU_HAS_LDAPSSL_CLIENT_INIT with APU_HAS_LDAP_NETSCAPE_SSL

as set by apr-util in util_ldap.c. This should allow mod_ldap
to work with the Netscape/Mozilla LDAP library.
PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97600 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 1102955dd8ae2c8a6c7a76abb29553789c1ff009..4d04e8ce384d1503664973e2f6506ae2c660667b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.44
 
+  *) Replace APU_HAS_LDAPSSL_CLIENT_INIT with APU_HAS_LDAP_NETSCAPE_SSL
+     as set by apr-util in util_ldap.c. This should allow mod_ldap
+     to work with the Netscape/Mozilla LDAP library. [Øyvin Sømme
+     <somme@oslo.westerngeco.slb.com>, Graham Leggett]
+
   *) Reorder the definitions for mod_ldap and mod_auth_ldap within
      config.m4 to make sure the parent mod_ldap is defined first.
      This ensures that mod_ldap comes before mod_auth_ldap in the

diff --git a/modules/experimental/util_ldap.c b/modules/experimental/util_ldap.c
index 23768ca43b42a391420eb2c6bfd52c6cd10479f3..06f7d85f91332494923c52542cb0a6ee345a8787 100644 (file)
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -205,7 +205,7 @@ LDAP_DECLARE(void) util_ldap_connection_close(util_ldap_connection_t *ldc)
  * with the pool cleanup function - causing the LDAP connections to be
  * shut down cleanly on graceful restart.
  */
-apr_status_t util_ldap_connection_destroy(void *param)
+LDAP_DECLARE(apr_status_t) util_ldap_connection_destroy(void *param)
 {
     util_ldap_connection_t *ldc = param;
 
@@ -1011,7 +1011,7 @@ static const char *util_ldap_set_opcache_entries(cmd_parms *cmd, void *dummy, co
     return NULL;
 }
 
-#ifdef APU_HAS_LDAPSSL_CLIENT_INIT
+#ifdef APU_HAS_LDAP_NETSCAPE_SSL
 static const char *util_ldap_set_certdbpath(cmd_parms *cmd, void *dummy, const char *path)
 {
     util_ldap_state_t *st = 
@@ -1092,7 +1092,7 @@ command_rec util_ldap_cmds[] = {
                   "Sets the maximum time (in seconds) that an item is cached in the LDAP "
                   "operation cache. Zero means no limit. Defaults to 600 seconds (10 minutes)."),
 
-#ifdef APU_HAS_LDAPSSL_CLIENT_INIT
+#ifdef APU_HAS_LDAP_NETSCAPE_SSL
     AP_INIT_TAKE1("LDAPCertDBPath", util_ldap_set_certdbpath, NULL, RSRC_CONF,
                   "Specifies the file containing Certificate Authority certificates "
                   "for validating secure LDAP server certificates. This file must be the "