JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* uinfo.cc (cygheap_domain_info::init): Correctly set

Browse Source 
lowest_tdo_posix_offset to UNIX_POSIX_OFFSET.
	(fetch_posix_offset): Redesign to fake a POSIX offset in all cases
	where we can't fetch a non-0 POSIX offset from our primary domain.
This commit is contained in:
Corinna Vinschen 2014-07-14 13:33:20 +00:00
parent 4866e86cb1
commit 6aafa0bfc2
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2014-07-14 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (cygheap_domain_info::init): Correctly set
lowest_tdo_posix_offset to UNIX_POSIX_OFFSET.
(fetch_posix_offset): Redesign to fake a POSIX offset in all cases
where we can't fetch a non-0 POSIX offset from our primary domain.
2014-07-14 Yaakov Selkowitz <yselkowitz@cygwin.com> 2014-07-14 Yaakov Selkowitz <yselkowitz@cygwin.com>
* thread.cc (pthread_mutex::pthread_mutex): Change default type * thread.cc (pthread_mutex::pthread_mutex): Change default type

26
winsup/cygwin/uinfo.cc
View File

@ -815,8 +815,9 @@ cygheap_domain_info::init ()
lsa_close_policy (lsa); lsa_close_policy (lsa);
if (cygheap->dom.member_machine ()) if (cygheap->dom.member_machine ())
{ {
/* For a domain member machine fetch all trusted domain info. */ /* For a domain member machine fetch all trusted domain info.
lowest_tdo_posix_offset = UNIX_POSIX_OFFSET - 1; Start out with UNIX_POSIX_OFFSET. */
lowest_tdo_posix_offset = UNIX_POSIX_OFFSET;
ret = DsEnumerateDomainTrustsW (NULL, DS_DOMAIN_DIRECT_INBOUND ret = DsEnumerateDomainTrustsW (NULL, DS_DOMAIN_DIRECT_INBOUND
| DS_DOMAIN_DIRECT_OUTBOUND | DS_DOMAIN_DIRECT_OUTBOUND
| DS_DOMAIN_IN_FOREST, | DS_DOMAIN_IN_FOREST,
@ -1137,27 +1138,24 @@ pwdgrp::fetch_account_from_file (fetch_user_arg_t &arg)
static ULONG static ULONG
fetch_posix_offset (PDS_DOMAIN_TRUSTSW td, cyg_ldap *cldap) fetch_posix_offset (PDS_DOMAIN_TRUSTSW td, cyg_ldap *cldap)
{ {
uint32_t id_val; uint32_t id_val = 0;
if (!td->PosixOffset && !(td->Flags & DS_DOMAIN_PRIMARY) && td->DomainSid) if (!td->PosixOffset && !(td->Flags & DS_DOMAIN_PRIMARY) && td->DomainSid)
{ {
if (cldap->open (NULL) != NO_ERROR) if (cldap->open (NULL) == NO_ERROR)
id_val = cldap->fetch_posix_offset_for_domain (td->DnsDomainName);
if (!id_val)
{ {
/* We're probably running under a local account, so we're not allowed /* We're probably running under a local account, so we're not allowed
to fetch any information from AD beyond the most obvious. Never to fetch any information from AD beyond the most obvious.
mind, just fake a reasonable posix offset. */ Alternatively we're suffering IT madness and some admin has
id_val = cygheap->dom.lowest_tdo_posix_offset actually set the POSIX offset to 0. Either way, fake a reasonable
- 0x01000000; posix offset and hope for the best. */
id_val = cygheap->dom.lowest_tdo_posix_offset - 0x00800000;
} }
else
id_val = cldap->fetch_posix_offset_for_domain (td->DnsDomainName);
if (id_val)
{
td->PosixOffset = id_val; td->PosixOffset = id_val;
if (id_val < cygheap->dom.lowest_tdo_posix_offset) if (id_val < cygheap->dom.lowest_tdo_posix_offset)
cygheap->dom.lowest_tdo_posix_offset = id_val; cygheap->dom.lowest_tdo_posix_offset = id_val;
}
} }
return td->PosixOffset; return td->PosixOffset;
} }