diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/uinfo.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index e1a61fc82..f60dbb92a 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2015-04-17 Corinna Vinschen <corinna@vinschen.de> + * uinfo.cc (pwdgrp::fetch_account_from_windows): Always revert SID + subauth count after checking for known domain. + +2015-04-17 Corinna Vinschen <corinna@vinschen.de> + * pwdgrp.h: Add comment to explain below change. (struct pg_pwd): Convert sid member to BYTE array. (struct pg_grp): Ditto. diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 6186327b6..bc5f814d0 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -2475,10 +2475,10 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) posix_offset = fetch_posix_offset (td, &loc_ldap); break; } + sid_sub_auth_count (sid) = sid_sub_auth_count (sid) + 1; } if (domain) { - sid_sub_auth_count (sid) = sid_sub_auth_count (sid) + 1; wcscpy (dom, domain); __small_swprintf (name = namebuf, L"%W(%u)", is_group () ? L"Group" : L"User", |