From 02bbbb7506709a0a821cdaa9a6ff0f07fb300dad Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 17 Apr 2015 11:57:57 +0200 Subject: [PATCH] Fix broken SID in passwd/group entry for unkown account * uinfo.cc (pwdgrp::fetch_account_from_windows): Always revert SID subauth count after checking for known domain. Signed-off-by: Corinna Vinschen --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/uinfo.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a3402617c..fb66f39f3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2015-04-17 Corinna Vinschen + + * uinfo.cc (pwdgrp::fetch_account_from_windows): Always revert SID + subauth count after checking for known domain. + 2015-04-17 Corinna Vinschen * pwdgrp.h: Add comment to explain below change. 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",