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

* Makefile.in (DLL_IMPORTS): Remove libadvapi32.a.

Browse Source 
* autoload.cc: Add all advapi32 entry points.
	* mount.cc (mount_info::init): Read user fstab only if we have a
	username.
	* passwd.cc (pwdgrp::read_passwd): Only use username if we have one.
	* shared.cc (user_info::initialize): Set cb last so as not to override
	planned behaviour in pwdgrp::read_passwd.
	* uinfo.cc (cygheap_user::init): Fetch Windows username from environment
	variable $USERNAME.  Don't set name in cygheap if variable is empty.
	(internal_getlogin): If we still have no username, try GetUserNameW.
This commit is contained in:
Corinna Vinschen
2010-09-28 14:40:18 +00:00
parent 91e0b943a0
commit 2f1f8815c0
7 changed files with 122 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
winsup/cygwin/uinfo.cc
View File

@@ -38,14 +38,16 @@ void
cygheap_user::init ()
{
WCHAR user_name[UNLEN + 1];
DWORD user_name_len = UNLEN + 1;
DWORD user_name_len;
if (!GetUserNameW (user_name, &user_name_len))
wcpcpy (user_name, L"unknown");
char mb_user_name[user_name_len = sys_wcstombs (NULL, 0, user_name)];
sys_wcstombs (mb_user_name, user_name_len, user_name);
set_name (mb_user_name);
user_name_len = GetEnvironmentVariableW (L"USERNAME", user_name, UNLEN + 1);
if (user_name_len)
{
user_name[UNLEN] = L'\0';
char mb_user_name[user_name_len = sys_wcstombs (NULL, 0, user_name)];
sys_wcstombs (mb_user_name, user_name_len, user_name);
set_name (mb_user_name);
}
DWORD siz;
PSECURITY_DESCRIPTOR psd;
@@ -96,10 +98,29 @@ internal_getlogin (cygheap_user &user)
{
struct passwd *pw = NULL;
cygpsid psid = user.sid ();
pw = internal_getpwsid (psid);
/* Handle a border case. If neither $USERNAME, nor /etc/passwd exists,
we tryto fetch the username from the system now. */
if (!user.name () || !*user.name ())
{
WCHAR user_name[UNLEN + 1];
DWORD user_name_len = UNLEN + 1;
if (!pw && !(pw = internal_getpwnam (user.name ()))
if (GetUserNameW (user_name, &user_name_len))
{
char mb_user_name[user_name_len = sys_wcstombs (NULL, 0, user_name)];
sys_wcstombs (mb_user_name, user_name_len, user_name);
user.set_name (mb_user_name);
}
else
user.set_name ("unknown");
}
else
{
cygpsid psid = user.sid ();
pw = internal_getpwsid (psid);
}
if (!pw && !(pw = internal_getpwnam (user.name (), true))
&& !(pw = internal_getpwuid (DEFAULT_UID)))
debug_printf ("user not found in augmented /etc/passwd");
else