Cygwin: load_user_profile: use local pointer when appropriate
dnsdomain does not have to be a copy of the domain, a pointer into cygheap is sufficient. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
parent
7ba9d12a72
commit
bffd21ad80
|
@ -278,11 +278,11 @@ load_user_profile (HANDLE token, struct passwd *pw, cygpsid &usersid)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cyg_ldap cldap;
|
cyg_ldap cldap;
|
||||||
PWCHAR dnsdomain = NULL;
|
PCWSTR dnsdomain = NULL;
|
||||||
|
|
||||||
debug_printf ("primary domain <%W>", cygheap->dom.primary_flat_name ());
|
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 ()))
|
||||||
dnsdomain = wcsdup (cygheap->dom.primary_dns_name ());
|
dnsdomain = cygheap->dom.primary_dns_name ();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
PDS_DOMAIN_TRUSTSW td = NULL;
|
PDS_DOMAIN_TRUSTSW td = NULL;
|
||||||
|
@ -292,7 +292,7 @@ load_user_profile (HANDLE token, struct passwd *pw, cygpsid &usersid)
|
||||||
debug_printf ("foreign domain <%W>", td->NetbiosDomainName);
|
debug_printf ("foreign domain <%W>", td->NetbiosDomainName);
|
||||||
if (!wcscasecmp (domain, td->NetbiosDomainName))
|
if (!wcscasecmp (domain, td->NetbiosDomainName))
|
||||||
{
|
{
|
||||||
dnsdomain = wcsdup (td->DnsDomainName);
|
dnsdomain = td->DnsDomainName;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -309,7 +309,6 @@ load_user_profile (HANDLE token, struct passwd *pw, cygpsid &usersid)
|
||||||
pi.lpProfilePath = userpath;
|
pi.lpProfilePath = userpath;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
free (dnsdomain);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
debug_printf ("Unknown domain <%W>?", domain);
|
debug_printf ("Unknown domain <%W>?", domain);
|
||||||
|
|
Loading…
Reference in New Issue