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

Revert accidental previous login.

Browse Source
This commit is contained in:
Corinna Vinschen
2010-09-28 14:49:31 +00:00
parent 2f1f8815c0
commit 2a9b4b7aa0
7 changed files with 19 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
winsup/cygwin/uinfo.cc
View File

@ -38,16 +38,14 @@ void
cygheap_user::init ()
{
WCHAR user_name[UNLEN + 1];
DWORD user_name_len;
DWORD user_name_len = UNLEN + 1;
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);
}
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);
DWORD siz;
PSECURITY_DESCRIPTOR psd;
@ -98,29 +96,10 @@ internal_getlogin (cygheap_user &user)
{
struct passwd *pw = NULL;
/* 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;
cygpsid psid = user.sid ();
pw = internal_getpwsid (psid);
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))
if (!pw && !(pw = internal_getpwnam (user.name ()))
&& !(pw = internal_getpwuid (DEFAULT_UID)))
debug_printf ("user not found in augmented /etc/passwd");
else