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

* sec_auth.cc (get_user_local_groups): Retrieve name of well known 

builtin group from system.  Explain why.
	* sec_helper.cc (well_known_builtin_sid): New SID for BUILTIN group.
	* security.h (well_known_builtin_sid): Declare.
This commit is contained in:
Corinna Vinschen 2010-02-12 17:40:42 +00:00
parent 848dbc8f98
commit e122c47112
4 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2010-02-12 Corinna Vinschen <corinna@vinschen.de>
* sec_auth.cc (get_user_local_groups): Retrieve name of well known
builtin group from system. Explain why.
* sec_helper.cc (well_known_builtin_sid): New SID for BUILTIN group.
* security.h (well_known_builtin_sid): Declare.
2010-02-11 Pierre Humblet <Pierre.Humblet@ieee.org> 2010-02-11 Pierre Humblet <Pierre.Humblet@ieee.org>
* registry.c (get_registry_hive_path): Add space in string. * registry.c (get_registry_hive_path): Add space in string.

42
winsup/cygwin/sec_auth.cc
View File

@ -320,20 +320,19 @@ get_user_local_groups (PWCHAR logonserver, PWCHAR domain,
} }
WCHAR domlocal_grp[MAX_DOMAIN_NAME_LEN + GNLEN + 2]; WCHAR domlocal_grp[MAX_DOMAIN_NAME_LEN + GNLEN + 2];
WCHAR builtin_grp[sizeof ("BUILTIN\\") + GNLEN + 2]; WCHAR builtin_grp[2 * GNLEN + 2];
PWCHAR dg_ptr, bg_ptr; PWCHAR dg_ptr, bg_ptr = NULL;
SID_NAME_USE use; SID_NAME_USE use;
dg_ptr = wcpcpy (domlocal_grp, domain); dg_ptr = wcpcpy (domlocal_grp, domain);
*dg_ptr++ = L'\\'; *dg_ptr++ = L'\\';
bg_ptr = wcpcpy (builtin_grp, L"BUILTIN\\");
for (DWORD i = 0; i < cnt; ++i) for (DWORD i = 0; i < cnt; ++i)
{ {
cygsid gsid; cygsid gsid;
DWORD glen = MAX_SID_LEN; DWORD glen = MAX_SID_LEN;
WCHAR dom[MAX_DOMAIN_NAME_LEN + 1]; WCHAR dom[MAX_DOMAIN_NAME_LEN + 1];
DWORD domlen = sizeof (dom); DWORD domlen = MAX_DOMAIN_NAME_LEN + 1;
use = SidTypeInvalid; use = SidTypeInvalid;
wcscpy (dg_ptr, buf[i].lgrpi0_name); wcscpy (dg_ptr, buf[i].lgrpi0_name);
@ -348,17 +347,36 @@ get_user_local_groups (PWCHAR logonserver, PWCHAR domain,
else if (GetLastError () == ERROR_NONE_MAPPED) else if (GetLastError () == ERROR_NONE_MAPPED)
{ {
/* Check if it's a builtin group. */ /* Check if it's a builtin group. */
wcscpy (bg_ptr, dg_ptr); if (!bg_ptr)
if (LookupAccountNameW (NULL, builtin_grp, gsid, &glen,
dom, &domlen, &use))
{ {
if (!legal_sid_type (use)) /* Retrieve name of builtin group from system since it's
debug_printf ("Rejecting local %W. use: %d", dg_ptr, use); localized. */
glen = 2 * GNLEN + 2;
if (!LookupAccountSidW (NULL, well_known_builtin_sid,
builtin_grp, &glen, domain, &domlen, &use))
debug_printf ("LookupAccountSid(BUILTIN), %E");
else else
grp_list *= gsid; {
bg_ptr = builtin_grp + wcslen (builtin_grp);
bg_ptr = wcpcpy (builtin_grp, L"\\");
}
}
if (bg_ptr)
{
wcscpy (bg_ptr, dg_ptr);
glen = MAX_SID_LEN;
domlen = MAX_DOMAIN_NAME_LEN + 1;
if (LookupAccountNameW (NULL, builtin_grp, gsid, &glen,
dom, &domlen, &use))
{
if (!legal_sid_type (use))
debug_printf ("Rejecting local %W. use: %d", dg_ptr, use);
else
grp_list *= gsid;
}
else
debug_printf ("LookupAccountName(%W), %E", builtin_grp);
} }
else
debug_printf ("LookupAccountName(%W), %E", builtin_grp);
} }
else else
debug_printf ("LookupAccountName(%W), %E", domlocal_grp); debug_printf ("LookupAccountName(%W), %E", domlocal_grp);

2
winsup/cygwin/sec_helper.cc
View File

@ -57,6 +57,8 @@ MKSID (well_known_this_org_sid, "S-1-5-15",
SECURITY_NT_AUTHORITY, 1, 15); SECURITY_NT_AUTHORITY, 1, 15);
MKSID (well_known_system_sid, "S-1-5-18", MKSID (well_known_system_sid, "S-1-5-18",
SECURITY_NT_AUTHORITY, 1, SECURITY_LOCAL_SYSTEM_RID); SECURITY_NT_AUTHORITY, 1, SECURITY_LOCAL_SYSTEM_RID);
MKSID (well_known_builtin_sid, "S-1-5-32",
SECURITY_NT_AUTHORITY, 1, SECURITY_BUILTIN_DOMAIN_RID);
MKSID (well_known_admins_sid, "S-1-5-32-544", MKSID (well_known_admins_sid, "S-1-5-32-544",
SECURITY_NT_AUTHORITY, 2, SECURITY_BUILTIN_DOMAIN_RID, SECURITY_NT_AUTHORITY, 2, SECURITY_BUILTIN_DOMAIN_RID,
DOMAIN_ALIAS_RID_ADMINS); DOMAIN_ALIAS_RID_ADMINS);

1
winsup/cygwin/security.h
View File

@ -327,6 +327,7 @@ extern cygpsid well_known_service_sid;
extern cygpsid well_known_authenticated_users_sid; extern cygpsid well_known_authenticated_users_sid;
extern cygpsid well_known_this_org_sid; extern cygpsid well_known_this_org_sid;
extern cygpsid well_known_system_sid; extern cygpsid well_known_system_sid;
extern cygpsid well_known_builtin_sid;
extern cygpsid well_known_admins_sid; extern cygpsid well_known_admins_sid;
extern cygpsid well_known_users_sid; extern cygpsid well_known_users_sid;
extern cygpsid fake_logon_sid; extern cygpsid fake_logon_sid;