www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Revert r1140069:

Browse Source 
Fix load order dependencies in LDAP code by switching to use of APR
    optional functions for the inter-module API...



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150164 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2011-07-23 17:10:49 +00:00
parent 2c8c92a192
commit 2d42def875
9 changed files with 81 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/ldap/util_ldap.c
View File

@@ -42,8 +42,6 @@
#error mod_ldap requires httpd to detect LDAP support
#endif
#include "ldap_private.h"
#ifdef LDAP_OPT_DEBUG_LEVEL
#define AP_LDAP_OPT_DEBUG LDAP_OPT_DEBUG_LEVEL
#else
@@ -2947,21 +2945,6 @@ static void util_ldap_register_hooks(apr_pool_t *p)
APR_REGISTER_OPTIONAL_FN(uldap_ssl_supported);
APR_REGISTER_OPTIONAL_FN(uldap_cache_check_subgroups);
APR_REGISTER_OPTIONAL_FN(ap_ldap_get_option);
APR_REGISTER_OPTIONAL_FN(ap_ldap_info);
APR_REGISTER_OPTIONAL_FN(ap_ldap_init);
APR_REGISTER_OPTIONAL_FN(ap_ldap_is_ldap_url);
APR_REGISTER_OPTIONAL_FN(ap_ldap_is_ldapi_url);
APR_REGISTER_OPTIONAL_FN(ap_ldap_is_ldaps_url);
APR_REGISTER_OPTIONAL_FN(ap_ldap_rebind_add);
APR_REGISTER_OPTIONAL_FN(ap_ldap_rebind_init);
APR_REGISTER_OPTIONAL_FN(ap_ldap_rebind_remove);
APR_REGISTER_OPTIONAL_FN(ap_ldap_set_option);
APR_REGISTER_OPTIONAL_FN(ap_ldap_ssl_deinit);
APR_REGISTER_OPTIONAL_FN(ap_ldap_ssl_init);
APR_REGISTER_OPTIONAL_FN(ap_ldap_url_parse);
APR_REGISTER_OPTIONAL_FN(ap_ldap_url_parse_ext);
ap_hook_pre_config(util_ldap_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config(util_ldap_post_config,NULL,NULL,APR_HOOK_MIDDLE);
ap_hook_handler(util_ldap_handler, NULL, NULL, APR_HOOK_MIDDLE);