diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-07-23 17:29:42 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-07-23 17:29:42 +0000 |
| commit | 602791140b032e069c1541c158d5100b738db16c (patch) | |
| tree | eb15de6cb5ea3e0e26c274ed081504ea3c21f96c /include/util_ldap.h | |
| parent | 9674eb32cb74108cceab8ce457b6910fcfe9a479 (diff) | |
| download | httpd-602791140b032e069c1541c158d5100b738db16c.tar.gz | |
Revert r1129808:
Incorporate the ap_ldap incomplete API, as there is no interest or effort
at APR to make this a complete abstraction, and it was voted 'off the island'
with APR 2.0. This will allow httpd 2.3 to build against either apr-2.0
or apr+util 1.x.
This also reverts part of r1142938, which needs to be re-done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150172 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/util_ldap.h')
| -rw-r--r-- | include/util_ldap.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/util_ldap.h b/include/util_ldap.h index 2ab4b7eb3f..18c990dbf5 100644 --- a/include/util_ldap.h +++ b/include/util_ldap.h @@ -28,10 +28,10 @@ #include "apr_thread_rwlock.h" #include "apr_tables.h" #include "apr_time.h" -#include "ap_ldap.h" -#include "ap_ldap_rebind.h" +#include "apr_ldap.h" +#include "apr_ldap_rebind.h" -#if AP_HAS_MICROSOFT_LDAPSDK +#if APR_HAS_MICROSOFT_LDAPSDK #define AP_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN \ ||(s) == LDAP_UNAVAILABLE) #else @@ -44,7 +44,7 @@ #endif /* this whole thing disappears if LDAP is not enabled */ -#if AP_HAS_LDAP +#if APR_HAS_LDAP /* Apache header files */ #include "ap_config.h" @@ -194,7 +194,7 @@ APR_DECLARE_OPTIONAL_FN(int,uldap_connection_open,(request_rec *r, * that was connected. * @tip This function unbinds from the LDAP server, and clears ldc->ldap. * It is possible to rebind to this server again using the same ldc - * structure, using ap_ldap_open_connection(). + * structure, using apr_ldap_open_connection(). * @fn util_ldap_close_connection(util_ldap_connection_t *ldc) */ APR_DECLARE_OPTIONAL_FN(void,uldap_connection_close,(util_ldap_connection_t *ldc)); @@ -222,7 +222,7 @@ APR_DECLARE_OPTIONAL_FN(apr_status_t,uldap_connection_unbind,(void *param)); * @tip Once a connection is found and returned, a lock will be acquired to * lock that particular connection, so that another thread does not try and * use this connection while it is busy. Once you are finished with a connection, - * ap_ldap_connection_close() must be called to release this connection. + * apr_ldap_connection_close() must be called to release this connection. * @fn util_ldap_connection_t *util_ldap_connection_find(request_rec *r, const char *host, int port, * const char *binddn, const char *bindpw, deref_options deref, * int netscapessl, int starttls) @@ -351,7 +351,7 @@ APR_DECLARE_OPTIONAL_FN(int,uldap_cache_getuserdn,(request_rec *r, util_ldap_con */ APR_DECLARE_OPTIONAL_FN(int,uldap_ssl_supported,(request_rec *r)); -/* from ap_ldap_cache.c */ +/* from apr_ldap_cache.c */ /** * Init the LDAP cache @@ -366,7 +366,7 @@ APR_DECLARE_OPTIONAL_FN(int,uldap_ssl_supported,(request_rec *r)); */ apr_status_t util_ldap_cache_init(apr_pool_t *pool, util_ldap_state_t *st); -/* from ap_ldap_cache_mgr.c */ +/* from apr_ldap_cache_mgr.c */ /** * Display formatted stats for cache @@ -379,5 +379,5 @@ char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st); #ifdef __cplusplus } #endif -#endif /* AP_HAS_LDAP */ +#endif /* APR_HAS_LDAP */ #endif /* UTIL_LDAP_H */ |