Cygwin: getgrent/getpwent: avoid local enumeration on DCs

...if we're supposed to enumerate the AD accounts anyway.  This
avoids some useless duplication.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc
index 0be8aa6b8b0e0865f2aaf81bdeb731f5c628c458..b8457a46f963b549279b4507e919628a32b48e79 100644 (file)
--- a/winsup/cygwin/passwd.cc
+++ b/winsup/cygwin/passwd.cc
@@ -385,6 +385,11 @@ pg_ent::getent (void)
     case from_local:
       if (from_db
          && nss_db_enum_local ()
+         /* Domain controller?  If so, sam and ad are one and the same
+            and "local ad" would list all domain accounts twice without
+            this test. */
+         && (cygheap->dom.account_flat_name ()[0] != L'@'
+             || !nss_db_enum_primary ())
          && (entry = enumerate_local ()))
        return entry;
       state = from_sam;