diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-02-18 10:25:14 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-02-18 10:25:14 +0000 |
| commit | c3470988cf57cc409173bc9b7897c6d7b83e5e14 (patch) | |
| tree | 85b4b839690cf9f45a3a52a11eb386bcca6f573a /winsup/cygwin/ldap.h | |
| parent | 8e25eb2c8565e4126fb4d3ef84ed461729bb6928 (diff) | |
| download | cygnal-c3470988cf57cc409173bc9b7897c6d7b83e5e14.tar.gz cygnal-c3470988cf57cc409173bc9b7897c6d7b83e5e14.tar.bz2 cygnal-c3470988cf57cc409173bc9b7897c6d7b83e5e14.zip | |
* ldap.cc (struct cyg_ldap_search): Add scope member.
(cyg_ldap::search_s): Add parameter scope. Use as LDAP search scope
instead of fixed LDAP_SCOPE_SUBTREE scope.
(ldap_search_thr): Call cyg_ldap::search_s with scope from argument.
(cyg_ldap::search): Add parameter scope and fill in to cyg_ldap_search.
(cyg_ldap::fetch_ad_account): Call search with LDAP_SCOPE_SUBTREE scope.
(cyg_ldap::fetch_posix_offset_for_domain): Call search with
LDAP_SCOPE_ONELEVEL scope.
(cyg_ldap::fetch_unix_sid_from_ad): Call search with LDAP_SCOPE_SUBTREE
scope.
(cyg_ldap::fetch_unix_name_from_rfc2307): Ditto.
* ldap.h (cyg_ldap::search): Align prototype to above change.
(cyg_ldap::search_s): Ditto.
Diffstat (limited to 'winsup/cygwin/ldap.h')
| -rw-r--r-- | winsup/cygwin/ldap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/ldap.h b/winsup/cygwin/ldap.h index fb4bebf7d..9209d854b 100644 --- a/winsup/cygwin/ldap.h +++ b/winsup/cygwin/ldap.h @@ -37,7 +37,7 @@ class cyg_ldap { inline int map_ldaperr_to_errno (ULONG lerr); inline int wait (cygthread *thr); inline int connect (PCWSTR domain); - inline int search (PWCHAR base, PWCHAR filter, PWCHAR *attrs); + inline int search (PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR *attrs); inline int next_page (); bool fetch_unix_sid_from_ad (uint32_t id, cygsid &sid, bool group); PWCHAR fetch_unix_name_from_rfc2307 (uint32_t id, bool group); @@ -53,7 +53,7 @@ public: ULONG connect_ssl (PCWSTR domain); ULONG connect_non_ssl (PCWSTR domain); - ULONG search_s (PWCHAR base, PWCHAR filter, PWCHAR *attrs); + ULONG search_s (PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR *attrs); ULONG next_page_s (); bool is_open () const { return !!lh; } |