diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-07-07 10:22:51 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-07-07 10:22:51 +0000 |
| commit | 72506dd846ff4021bdbcf0f6802748920db2b56e (patch) | |
| tree | 562523b3bcec6f65cfed7490b5390d345d36dcda | |
| parent | f0c23915ec2131b2867f04fe3e117807973a2aa1 (diff) | |
| download | cygnal-72506dd846ff4021bdbcf0f6802748920db2b56e.tar.gz cygnal-72506dd846ff4021bdbcf0f6802748920db2b56e.tar.bz2 cygnal-72506dd846ff4021bdbcf0f6802748920db2b56e.zip | |
* passwd.cc (pg_ent::enumerate_ad): Revert to simply skipping a domain
if opening the connection to the domain fails.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/passwd.cc | 21 |
2 files changed, 10 insertions, 16 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6d339d905..6763fa821 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -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> Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc index 928633559..b8ed09466 100644 --- a/winsup/cygwin/passwd.cc +++ b/winsup/cygwin/passwd.cc @@ -593,19 +593,13 @@ pg_ent::enumerate_ad () if (!cnt) { PDS_DOMAIN_TRUSTSW td; - int ret; if (!resume) { ++resume; - if (!nss_db_enum_primary ()) + if (!nss_db_enum_primary () + || cldap.enumerate_ad_accounts (NULL, group) != NO_ERROR) 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))) { @@ -618,15 +612,10 @@ 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))) + && !nss_db_enum_tdom (td->DnsDomainName)) + || cldap.enumerate_ad_accounts (td->DnsDomainName, group) + != NO_ERROR) continue; - if ((ret = cldap.enumerate_ad_accounts (td->DnsDomainName, group)) - != NO_ERROR) - { - cldap.close (); - set_errno (ret); - return NULL; - } } else { |