Revert "Cygwin: load_user_profile: temporarily extend debug output"
This reverts commit 6aef5a46d7f22841e6a859103bb3f8acea060b84.
This commit is contained in:
parent
5c4ce731ac
commit
ad49232083
@ -259,7 +259,6 @@ load_user_profile (HANDLE token, struct passwd *pw, cygpsid &usersid)
|
|||||||
pi.lpUserName = username;
|
pi.lpUserName = username;
|
||||||
/* Check if user has a roaming profile and fill in lpProfilePath, if so.
|
/* Check if user has a roaming profile and fill in lpProfilePath, if so.
|
||||||
Call NetUserGetInfo only for local machine accounts, use LDAP otherwise. */
|
Call NetUserGetInfo only for local machine accounts, use LDAP otherwise. */
|
||||||
debug_printf ("machine <%W>", cygheap->dom.account_flat_name ());
|
|
||||||
if (!wcscasecmp (domain, cygheap->dom.account_flat_name ()))
|
if (!wcscasecmp (domain, cygheap->dom.account_flat_name ()))
|
||||||
{
|
{
|
||||||
NET_API_STATUS nas;
|
NET_API_STATUS nas;
|
||||||
@ -284,20 +283,16 @@ load_user_profile (HANDLE token, struct passwd *pw, cygpsid &usersid)
|
|||||||
cyg_ldap cldap;
|
cyg_ldap cldap;
|
||||||
PCWSTR dnsdomain = NULL;
|
PCWSTR dnsdomain = NULL;
|
||||||
|
|
||||||
debug_printf ("primary domain <%W>", cygheap->dom.primary_flat_name ());
|
|
||||||
if (wcscasecmp (domain, cygheap->dom.primary_flat_name ()))
|
if (wcscasecmp (domain, cygheap->dom.primary_flat_name ()))
|
||||||
{
|
{
|
||||||
PDS_DOMAIN_TRUSTSW td = NULL;
|
PDS_DOMAIN_TRUSTSW td = NULL;
|
||||||
|
|
||||||
for (ULONG idx = 0; (td = cygheap->dom.trusted_domain (idx)); ++idx)
|
for (ULONG idx = 0; (td = cygheap->dom.trusted_domain (idx)); ++idx)
|
||||||
{
|
if (!wcscasecmp (domain, td->NetbiosDomainName))
|
||||||
debug_printf ("foreign domain <%W>", td->NetbiosDomainName);
|
{
|
||||||
if (!wcscasecmp (domain, td->NetbiosDomainName))
|
dnsdomain = td->DnsDomainName;
|
||||||
{
|
break;
|
||||||
dnsdomain = td->DnsDomainName;
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (cldap.fetch_ad_account (usersid, false, dnsdomain))
|
if (cldap.fetch_ad_account (usersid, false, dnsdomain))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user