summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/ldap.h
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2014-05-22 20:07:25 +0000
committerCorinna Vinschen <corinna@vinschen.de>2014-05-22 20:07:25 +0000
commit449429c16a09fcb61f743bf81b5bd63d08b3642d (patch)
tree1c20572e8879ccae88cd73a9cdf7a894b7b51f7c /winsup/cygwin/ldap.h
parentde13ccea73cb3d340e5bfa43c1e2f86ba5f8bddd (diff)
downloadcygnal-449429c16a09fcb61f743bf81b5bd63d08b3642d.tar.gz
cygnal-449429c16a09fcb61f743bf81b5bd63d08b3642d.tar.bz2
cygnal-449429c16a09fcb61f743bf81b5bd63d08b3642d.zip
* 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.
Diffstat (limited to 'winsup/cygwin/ldap.h')
-rw-r--r--winsup/cygwin/ldap.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/winsup/cygwin/ldap.h b/winsup/cygwin/ldap.h
index a2bf0bde8..696fbebe0 100644
--- a/winsup/cygwin/ldap.h
+++ b/winsup/cygwin/ldap.h
@@ -33,7 +33,8 @@ class cyg_ldap {
PWCHAR *val;
PWCHAR *attr;
bool isAD;
- ULONG msg_id;
+ PLDAPSearch srch_id;
+ PLDAPMessage srch_msg, srch_entry;
bool connect_ssl (PCWSTR domain);
bool connect_non_ssl (PCWSTR domain);
@@ -43,8 +44,8 @@ class cyg_ldap {
uint32_t get_num_attribute (int idx);
public:
- cyg_ldap () : lh (NULL), rootdse (NULL), msg (NULL), entry (NULL),
- val (NULL), isAD (false), msg_id ((ULONG) -1)
+ cyg_ldap () : lh (NULL), rootdse (NULL), msg (NULL), entry (NULL), val (NULL),
+ isAD (false), srch_id (NULL), srch_msg (NULL), srch_entry (NULL)
{}
~cyg_ldap () { close (); }