diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-02-10 20:28:32 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-02-10 20:28:32 +0000 |
| commit | 85827fa6856b5bb3af42453780d61427e2e230b0 (patch) | |
| tree | 1cd0056d24474fcd28c81572c80cebae3364abcb | |
| parent | b0244c497bf91e7108aa76093f402d0fe0888b0a (diff) | |
| download | cygnal-85827fa6856b5bb3af42453780d61427e2e230b0.tar.gz cygnal-85827fa6856b5bb3af42453780d61427e2e230b0.tar.bz2 cygnal-85827fa6856b5bb3af42453780d61427e2e230b0.zip | |
* uinfo.cc (cygheap_domain_info::init): Drop accidentally leftover if
statement.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/uinfo.cc | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1b9574050..23717c6c9 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2014-02-10 Corinna Vinschen <corinna@vinschen.de> + * uinfo.cc (cygheap_domain_info::init): Drop accidentally leftover if + statement. + +2014-02-10 Corinna Vinschen <corinna@vinschen.de> + * uinfo.cc (cygheap_domain_info::init): Fix handling of account domain on donmain controllers. Explain why. 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 ()) |