* autoload.cc (ldap_search_sW): Replace ldap_search_stW.
(LdapMapErrorToWin32): Import. * fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Accommodate change to cyg_ldap::open. * ldap.cc (CYG_LDAP_TIMEOUT): Remove. (CYG_LDAP_ENUM_TIMEOUT): Remove. (def_tv): Remove. (enum_tv): Remove. (cyg_ldap::map_ldaperr_to_errno): New method to map LDAP error codes to POSIX errno codes. Explicitly map LDAP_NO_RESULTS_RETURNED to ENMFILE. (cyg_ldap::wait): Ditto. (struct cyg_ldap_init): New struct. (cyg_ldap::connect_ssl): Return ULONG. Drop setting LDAP_OPT_TIMELIMIT. Add call to ldap_search_sW to fetch root DSE. (cyg_ldap::connect_non_ssl): Ditto. (ldap_init_thr): New static thread function. (cyg_ldap::connect): New method to call connect_ssl/connect_non_ssl in an interruptible cygthread. (struct cyg_ldap_search): New struct. (cyg_ldap::search_s): New method to perform generic synchronous search. (ldap_search_thr): New static thread function. (cyg_ldap::search): New method to call search_s in an interruptible cygthread. (struct cyg_ldap_next_page): New struct. (cyg_ldap::next_page_s): New method to perform generic synchronous paged search. (ldap_next_page_thr): New static thread function. (cyg_ldap::next_page): New method to call next_page_s in an interruptible cygthread. (cyg_ldap::open): Return POSIX errno. Call connect method. (cyg_ldap::fetch_ad_account): Call search method rather than ldap_search_stW. (cyg_ldap::enumerate_ad_accounts): Return POSIX errno. Use infinite timeout in call to ldap_search_init_pageW. (cyg_ldap::next_account): Return POSIX errno. Call next_page method rather than ldap_get_next_page_s. (cyg_ldap::fetch_posix_offset_for_domain): Call search method rather than ldap_search_stW. (cyg_ldap::fetch_unix_sid_from_ad): Ditto. (cyg_ldap::fetch_unix_name_from_rfc2307): Ditto. * ldap.h (class cyg_ldap): Accommodate aforementioned changes. * passwd.cc (pg_ent::enumerate_ad): Ditto. Break search if one of cyg_ldap::enumerate_ad_accounts or cldap.next_account returns with an error code other than ENMFILE. * sec_helper.cc (cygpsid::get_id): Accommodate change to cyg_ldap::open. * uinfo.cc (fetch_posix_offset): Ditto.
This commit is contained in:
@@ -593,13 +593,19 @@ pg_ent::enumerate_ad ()
|
||||
if (!cnt)
|
||||
{
|
||||
PDS_DOMAIN_TRUSTSW td;
|
||||
int ret;
|
||||
|
||||
if (!resume)
|
||||
{
|
||||
++resume;
|
||||
if (!nss_db_enum_primary ()
|
||||
|| !cldap.enumerate_ad_accounts (NULL, group))
|
||||
if (!nss_db_enum_primary ())
|
||||
continue;
|
||||
if ((ret = cldap.enumerate_ad_accounts (NULL, group)) != NO_ERROR)
|
||||
{
|
||||
cldap.close ();
|
||||
set_errno (ret);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
else if ((td = cygheap->dom.trusted_domain (resume - 1)))
|
||||
{
|
||||
@@ -612,9 +618,15 @@ pg_ent::enumerate_ad ()
|
||||
if (((enums & ENUM_TDOMS_ALL) && td->Flags & DS_DOMAIN_PRIMARY)
|
||||
|| !td->DomainSid
|
||||
|| (!nss_db_enum_tdom (td->NetbiosDomainName)
|
||||
&& !nss_db_enum_tdom (td->DnsDomainName))
|
||||
|| !cldap.enumerate_ad_accounts (td->DnsDomainName, group))
|
||||
&& !nss_db_enum_tdom (td->DnsDomainName)))
|
||||
continue;
|
||||
if ((ret = cldap.enumerate_ad_accounts (td->DnsDomainName, group))
|
||||
!= NO_ERROR)
|
||||
{
|
||||
cldap.close ();
|
||||
set_errno (ret);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -624,7 +636,8 @@ pg_ent::enumerate_ad ()
|
||||
}
|
||||
++cnt;
|
||||
cygsid sid;
|
||||
if (cldap.next_account (sid))
|
||||
int ret = cldap.next_account (sid);
|
||||
if (ret == NO_ERROR)
|
||||
{
|
||||
fetch_user_arg_t arg;
|
||||
arg.type = SID_arg;
|
||||
@@ -632,6 +645,13 @@ pg_ent::enumerate_ad ()
|
||||
char *line = pg.fetch_account_from_windows (arg, &cldap);
|
||||
if (line)
|
||||
return pg.add_account_post_fetch (line, false);
|
||||
ret = EIO;
|
||||
}
|
||||
if (ret != ENMFILE)
|
||||
{
|
||||
cldap.close ();
|
||||
set_errno (ret);
|
||||
return NULL;
|
||||
}
|
||||
cnt = 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user