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

* uinfo.cc (pwdgrp::fetch_account_from_windows): Tweak SID<->uid 

conversion to cover S-1-5-113, S-1-5-114, and S-1-5-1000 groups.
This commit is contained in:
Corinna Vinschen 2014-05-07 12:07:12 +00:00
parent 20de26ebf9
commit 951bc34df4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2014-05-07 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (pwdgrp::fetch_account_from_windows): Tweak SID<->uid
conversion to cover S-1-5-113, S-1-5-114, and S-1-5-1000 groups.
2014-05-07 Corinna Vinschen <corinna@vinschen.de> 2014-05-07 Corinna Vinschen <corinna@vinschen.de>
* grp.cc (pwdgrp::parse_group): Set grp.len. Drop generating any * grp.cc (pwdgrp::parse_group): Set grp.len. Drop generating any

5
winsup/cygwin/uinfo.cc
View File

@ -1271,6 +1271,8 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
by mkpasswd/mkgroup. */ by mkpasswd/mkgroup. */
if (arg.id < 0x200) if (arg.id < 0x200)
__small_swprintf (sidstr, L"S-1-5-%u", arg.id & 0x1ff); __small_swprintf (sidstr, L"S-1-5-%u", arg.id & 0x1ff);
else if (arg.id == 0x3e8) /* Special case "Other Organization" */
wcpcpy (sidstr, L"S-1-5-1000");
else if (arg.id <= 0x7ff) else if (arg.id <= 0x7ff)
__small_swprintf (sidstr, L"S-1-5-32-%u", arg.id & 0x7ff); __small_swprintf (sidstr, L"S-1-5-32-%u", arg.id & 0x7ff);
else else
@ -1659,7 +1661,8 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
if (sid_id_auth (sid) != 5 /* SECURITY_NT_AUTHORITY */) if (sid_id_auth (sid) != 5 /* SECURITY_NT_AUTHORITY */)
uid = 0x10000 + 0x100 * sid_id_auth (sid) uid = 0x10000 + 0x100 * sid_id_auth (sid)
+ (sid_sub_auth_rid (sid) & 0xff); + (sid_sub_auth_rid (sid) & 0xff);
else if (sid_sub_auth (sid, 0) < SECURITY_PACKAGE_BASE_RID) else if (sid_sub_auth (sid, 0) < SECURITY_PACKAGE_BASE_RID
|| sid_sub_auth (sid, 0) > SECURITY_MAX_BASE_RID)
uid = sid_sub_auth_rid (sid) & 0x7ff; uid = sid_sub_auth_rid (sid) & 0x7ff;
else else
{ {