diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1b9574050..23717c6c9 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2014-02-10 Corinna Vinschen + + * uinfo.cc (cygheap_domain_info::init): Drop accidentally leftover if + statement. + 2014-02-10 Corinna Vinschen * uinfo.cc (cygheap_domain_info::init): Fix handling of account domain diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 1e54d3956..d522b9f7b 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -750,8 +750,7 @@ cygheap_domain_info::init () trying to compute the uid/gid values. Therefore we invalidate the account domain name if we're running on a DC. */ adom_sid = adom->DomainSid; - if (pdom_sid == adom_sid) - adom_name = cwcsdup (pdom_sid == adom_sid ? L"@" : adom->DomainName.Buffer); + adom_name = cwcsdup (pdom_sid == adom_sid ? L"@" : adom->DomainName.Buffer); LsaFreeMemory (adom); lsa_close_policy (lsa); if (cygheap->dom.member_machine ())