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

uinfo.cc: More comment fixes, remove unused testing code.

Browse Source 
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2016-06-15 19:48:43 +02:00
parent 5881f0c0c8
commit 747b3f44e3
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
winsup/cygwin/uinfo.cc
View File

@ -44,13 +44,13 @@ cygheap_user::init ()
WCHAR user_name[UNLEN + 1]; WCHAR user_name[UNLEN + 1];
DWORD user_name_len = UNLEN + 1; DWORD user_name_len = UNLEN + 1;
/* This code is only run if a Cygwin process gets started by a native /* This method is only called if a Cygwin process gets started by a
Win32 process. We try to get the username from the environment, native Win32 process. Try to get the username from the environment,
first USERNAME (Win32), then USER (POSIX). If that fails (which is first USERNAME (Win32), then USER (POSIX). If that fails (which is
very unlikely), it only has an impact if we don't have an entry in very unlikely), it only has an impact if we don't have an entry in
/etc/passwd for this user either. In that case the username sticks /etc/passwd for this user either. In that case the username sticks
to "unknown". Since this is called early in initialization, and to "unknown". Since this is called early in initialization, and
since we don't want pull in a dependency to any other DLL except since we don't want to pull in a dependency to any other DLL except
ntdll and kernel32 at this early stage, don't call GetUserName, ntdll and kernel32 at this early stage, don't call GetUserName,
GetUserNameEx, NetWkstaUserGetInfo, etc. */ GetUserNameEx, NetWkstaUserGetInfo, etc. */
if (GetEnvironmentVariableW (L"USERNAME", user_name, user_name_len) if (GetEnvironmentVariableW (L"USERNAME", user_name, user_name_len)
@ -221,7 +221,7 @@ uinfo_init ()
return; return;
if (!child_proc_info) if (!child_proc_info)
internal_getlogin (cygheap->user); /* Set the cygheap->user. */ internal_getlogin (cygheap->user); /* Set cygheap->user. */
/* Conditions must match those in spawn to allow starting child /* Conditions must match those in spawn to allow starting child
processes with ruid != euid and rgid != egid. */ processes with ruid != euid and rgid != egid. */
else if (cygheap->user.issetuid () else if (cygheap->user.issetuid ()
@ -644,14 +644,6 @@ cygheap_pwdgrp::init ()
grp_src = (NSS_SRC_FILES | NSS_SRC_DB); grp_src = (NSS_SRC_FILES | NSS_SRC_DB);
prefix = NSS_PFX_AUTO; prefix = NSS_PFX_AUTO;
separator[0] = L'+'; separator[0] = L'+';
#if 0
home_scheme[0].method = NSS_SCHEME_CYGWIN;
home_scheme[1].method = NSS_SCHEME_DESC;
shell_scheme[0].method = NSS_SCHEME_CYGWIN;
shell_scheme[1].method = NSS_SCHEME_DESC;
gecos_scheme[0].method = NSS_SCHEME_CYGWIN;
gecos_scheme[1].method = NSS_SCHEME_DESC;
#endif
enums = (ENUM_CACHE | ENUM_BUILTIN); enums = (ENUM_CACHE | ENUM_BUILTIN);
enum_tdoms = NULL; enum_tdoms = NULL;
caching = true; /* INTERNAL ONLY */ caching = true; /* INTERNAL ONLY */