public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_5-branch] Cygwin: getgrent: fix local SAM enumeration on domain member machines Date: Tue, 27 Feb 2024 11:19:53 +0000 (GMT) [thread overview] Message-ID: <20240227111953.353C43858414@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=50240f20ecfc7bc7a2961c25f96f5b9345c984ac commit 50240f20ecfc7bc7a2961c25f96f5b9345c984ac Author: Corinna Vinschen <corinna@vinschen.de> AuthorDate: Tue Feb 20 23:51:33 2024 +0100 Commit: Corinna Vinschen <corinna@vinschen.de> CommitDate: Mon Feb 26 10:04:32 2024 +0100 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> Diff: --- winsup/cygwin/grp.cc | 12 +++++++++--- 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 b06ad379128a..77cf6a72c69f 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 d1708953d353..0be8aa6b8b0e 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;
reply other threads:[~2024-02-27 11:19 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240227111953.353C43858414@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).