diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/uinfo.cc | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 99a843935..a9c3f9f02 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 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> + * grp.cc (pwdgrp::parse_group): Set grp.len. Drop generating any gr_mem entries. (getgrgid_r): Don't try to copy gr_mem entries. Always set gr_mem diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 1de113202..5d69f4236 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -1271,6 +1271,8 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) by mkpasswd/mkgroup. */ if (arg.id < 0x200) __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) __small_swprintf (sidstr, L"S-1-5-32-%u", arg.id & 0x7ff); 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 */) uid = 0x10000 + 0x100 * sid_id_auth (sid) + (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; else { |