Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2002-11-25 18:11:39 +0300
committerCorinna Vinschen <corinna@vinschen.de>2002-11-25 18:11:39 +0300
commitefcaf0426a406b43799cc899e3d6bd00d0f777e1 (patch)
treed09565e3f6bd5281ae5382ef1c580ddfc25b4ae7 /winsup/cygwin/uinfo.cc
parentf1da8a066438b2323253e11b10a4037205c1b3c2 (diff)
* passwd.cc (read_etc_passwd): Never add an entry when starting
on Win95/98/ME if a default entry is present. * uinfo.cc (internal_getlogin): Look for the default uid if needed. Always call user.set_name ().
Diffstat (limited to 'winsup/cygwin/uinfo.cc')
-rw-r--r--winsup/cygwin/uinfo.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index f445649b6..8dec58e66 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -61,20 +61,21 @@ internal_getlogin (cygheap_user &user)
from the Windows user name */
if (ret)
{
- if ((pw = internal_getpwsid (tu)))
- user.set_name (pw->pw_name);
+ pw = internal_getpwsid (tu);
/* Set token owner to the same value as token user */
if (!SetTokenInformation (ptok, TokenOwner, &tu, sizeof tu))
debug_printf ("SetTokenInformation(TokenOwner): %E");
}
}
- if (!pw && !(pw = getpwnam (user.name ())))
- debug_printf("user name not found in augmented /etc/passwd");
+ if (!pw && !(pw = getpwnam (user.name ()))
+ && !(pw = getpwuid32 (DEFAULT_UID)))
+ debug_printf("user not found in augmented /etc/passwd");
else
{
myself->uid = pw->pw_uid;
myself->gid = pw->pw_gid;
+ user.set_name (pw->pw_name);
if (wincap.has_security ())
{
cygsid gsid;