From 449429c16a09fcb61f743bf81b5bd63d08b3642d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 22 May 2014 20:07:25 +0000 Subject: * autoload.cc (ldap_abandon): Remove. (ldap_count_entries): Import. (ldap_get_next_page_s): Import. (ldap_result): Remove. (ldap_searchW): Remove. (ldap_search_abandon_page): Import. (ldap_search_init_pageW): Import. * ldap.cc (cyg_ldap::close): Use ldap_search_abandon_page to abandon search. Reset srch_id, srch_msg and srch_entry. (cyg_ldap::enumerate_ad_accounts): Use paged search to overcome server side search result set restriction. (cyg_ldap::next_account): Ditto. * ldap.h (class cyg_ldap): Add members srch_id, srch_msg and srch_entry. Remove member msg_id. (cyg_ldap::cyg_ldap): Change initialization accordingly. --- winsup/cygwin/autoload.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/autoload.cc') diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index 822a30a44..fa2cd65c5 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -585,17 +585,18 @@ LoadDLLfunc (LocaleNameToLCID, 8, kernel32) #pragma push_macro ("mangle") #undef mangle #define mangle(name, n) #name -LoadDLLfunc (ldap_abandon, 0, wldap32) LoadDLLfunc (ldap_bind_s, 0, wldap32) +LoadDLLfunc (ldap_count_entries, 0, wldap32) LoadDLLfunc (ldap_count_valuesW, 0, wldap32) LoadDLLfunc (ldap_first_entry, 0, wldap32) +LoadDLLfunc (ldap_get_next_page_s, 0, wldap32) LoadDLLfunc (ldap_get_valuesW, 0, wldap32) LoadDLLfunc (ldap_get_values_lenW, 0, wldap32) LoadDLLfunc (ldap_initW, 0, wldap32) LoadDLLfunc (ldap_memfreeW, 0, wldap32) LoadDLLfunc (ldap_next_entry, 0, wldap32) -LoadDLLfunc (ldap_result, 0, wldap32) -LoadDLLfunc (ldap_searchW, 0, wldap32) +LoadDLLfunc (ldap_search_abandon_page, 0, wldap32) +LoadDLLfunc (ldap_search_init_pageW, 0, wldap32) LoadDLLfunc (ldap_search_stW, 0, wldap32) LoadDLLfunc (ldap_set_option, 0, wldap32) LoadDLLfunc (ldap_sslinitW, 0, wldap32) -- cgit v1.2.3