diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2024-02-20 23:51:33 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2024-02-26 10:04:32 +0100 |
| commit | 50240f20ecfc7bc7a2961c25f96f5b9345c984ac (patch) | |
| tree | a38c5a4d727c9e4a48a69dd3dd4fbee1453b1f08 | |
| parent | 271f187b7b59a6645e24e9c36b60ba31f6527556 (diff) | |
| download | newlib-50240f20ecfc7bc7a2961c25f96f5b9345c984ac.zip newlib-50240f20ecfc7bc7a2961c25f96f5b9345c984ac.tar.gz newlib-50240f20ecfc7bc7a2961c25f96f5b9345c984ac.tar.bz2 | |
Cygwin: getgrent: fix local SAM enumeration on domain member machines
Don't skip output of local SAM groups on domain member machines.
They can have valid, user-defined groups in their SAM. Just
skip builtin groups if we're enumerating AD as well.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/grp.cc | 12 | ||||
| -rw-r--r-- | winsup/cygwin/passwd.cc | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc index b06ad37..77cf6a7 100644 --- a/winsup/cygwin/grp.cc +++ b/winsup/cygwin/grp.cc @@ -424,9 +424,15 @@ gr_ent::enumerate_local () DWORD dlen = DNLEN + 1; SID_NAME_USE acc_type; - LookupAccountNameW (NULL, - ((PLOCALGROUP_INFO_0) buf)[cnt++].lgrpi0_name, - sid, &slen, dom, &dlen, &acc_type); + if (!LookupAccountNameW (NULL, + ((PLOCALGROUP_INFO_0) buf)[cnt++].lgrpi0_name, + sid, &slen, dom, &dlen, &acc_type)) + continue; + if (sid_id_auth (sid) == 5 /* SECURITY_NT_AUTHORITY */ + && sid_sub_auth (sid, 0) == SECURITY_BUILTIN_DOMAIN_RID + && cygheap->dom.member_machine () + && nss_db_enum_primary ()) + continue; fetch_user_arg_t arg; arg.type = SID_arg; arg.sid = &sid; diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc index d170895..0be8aa6 100644 --- a/winsup/cygwin/passwd.cc +++ b/winsup/cygwin/passwd.cc @@ -385,8 +385,6 @@ pg_ent::getent (void) case from_local: if (from_db && nss_db_enum_local () - && (!cygheap->dom.member_machine () - || !nss_db_enum_primary ()) && (entry = enumerate_local ())) return entry; state = from_sam; |