drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* passwd.cc (pg_ent::enumerate_ad): Revert to simply skipping a domain 

if opening the connection to the domain fails.
This commit is contained in:
Corinna Vinschen 2014-07-07 10:22:51 +00:00
parent f0c23915ec
commit 72506dd846
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2014-07-07 Corinna Vinschen <corinna@vinschen.de>
* passwd.cc (pg_ent::enumerate_ad): Revert to simply skipping a domain
if opening the connection to the domain fails.
2014-07-07 Pierre Humblet <Pierre.Humblet@ieee.org> 2014-07-07 Pierre Humblet <Pierre.Humblet@ieee.org>
Corinna Vinschen <corinna@vinschen.de> Corinna Vinschen <corinna@vinschen.de>

21
winsup/cygwin/passwd.cc
View File

@ -593,19 +593,13 @@ pg_ent::enumerate_ad ()
if (!cnt) if (!cnt)
{ {
PDS_DOMAIN_TRUSTSW td; PDS_DOMAIN_TRUSTSW td;
int ret;
if (!resume) if (!resume)
{ {
++resume; ++resume;
if (!nss_db_enum_primary ()) if (!nss_db_enum_primary ()
|| cldap.enumerate_ad_accounts (NULL, group) != NO_ERROR)
continue; 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))) else if ((td = cygheap->dom.trusted_domain (resume - 1)))
{ {
@ -618,15 +612,10 @@ pg_ent::enumerate_ad ()
if (((enums & ENUM_TDOMS_ALL) && td->Flags & DS_DOMAIN_PRIMARY) if (((enums & ENUM_TDOMS_ALL) && td->Flags & DS_DOMAIN_PRIMARY)
|| !td->DomainSid || !td->DomainSid
|| (!nss_db_enum_tdom (td->NetbiosDomainName) || (!nss_db_enum_tdom (td->NetbiosDomainName)
&& !nss_db_enum_tdom (td->DnsDomainName))) && !nss_db_enum_tdom (td->DnsDomainName))
|| cldap.enumerate_ad_accounts (td->DnsDomainName, group)
!= NO_ERROR)
continue; continue;
if ((ret = cldap.enumerate_ad_accounts (td->DnsDomainName, group))
!= NO_ERROR)
{
cldap.close ();
set_errno (ret);
return NULL;
}
} }
else else
{ {