diff options
author | Christopher Faylor <me@cgf.cx> | 2000-09-03 08:16:35 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2000-09-03 08:16:35 +0400 |
commit | b0e82b74fbdfa2dee89505aba03f2827480cc8ca (patch) | |
tree | 42b2a83a749596de6cb3a075e379a4e30ecd1796 /winsup/cygwin/uinfo.cc | |
parent | 39630fe3a1b6106001a9f5f65a9d52bf48583739 (diff) |
* Makefile.in: Add cygheap.o.
* child_info.h: Add specific exec class.
* cygheap.h: New file. Contains declarations for cygwin heap.
* cygheap.cc: New file. Implements cygwin heap functions.
* dcrt0.cc (quoted): Simplify due to new method for passing arguments between
cygwin programs.
(alloc_stack_hard_way): Attempt to handle overlapped stack.
(dll_crt0_1): Move child_info processing here. Accomodate new method for
passing arguments between cygwin programs. Initialize cygwin heap. Establish
__argc and __argv variables.
(_dll_crt0): Move most of child_info processing to dll_crt0_1.
(cygwin_dll_init): Remove duplication.
* dtable.cc (dtable::extend): Allocate dtable using cygwin heap.
(dtable::build_fhandler): Ditto for fhandler type being constructed.
(dtable::dup_worker): Free new fhandler from cygwin heap on error.
(dtable::select_*): Don't assume that this == fdtab.
(dtable::linearize_fd_array): Delete.
(dtable::delinearize_fd_array): Delete.
(dtable::fixup_after_exec): New file.
(dtable::vfork_child_dup): Use cygwin heap.
(dtable::vfork_parent_restore): Ditto.
* dtable.h: Remove obsolete methods. Add new method.
* environ.cc (posify): Eliminate already_posix parameter and logic.
(envsize): New function.
(_addenv): Use envsize.
(environ_init): Accept an argument pointing to an existing environment list.
If supplied, allocate space for this in the the program's heap.
* fhandler.cc (fhandler_base::operator =): Move here from fhandler.h. Use
cygwin heap to allocate filenames.
(fhandler_base::set_name): Allocate/free names from cygwin heap.
(fhandler_base::linearize): Delete.
(fhandler_base::de_linearize): Delete.
(fhandler_base::operator delete): Free from cygwin heap.
(fhandler_base::~fhandler_base): Ditto.
* fhandler.h: Accomodate elimination of *linearize and other changes above.
* fhandler_console.cc (fhandler_console::fixup_after_exec): Rename from
de_linearize.
* heap.h: New file.
* fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Use cygwin heap for
name. fhandler_tty::fixup_after_exec): Rename from de_linearize.
* fork.cc (fork): Call cygheap_fixup_in_child.
* heap.cc: Use declarations in heap.h.
* malloc.cc: Sprinkle assertions throughout to catch attempts to free/realloc
something from the cygwin heap.
* path.cc: Throughout, eliminate use of per-thread cache for cwd. Use cwd_*
functions rather than cwd_* variables to access cwd_win32 and cwd_posix.
(cwd_win32): New function.
(cwd_posix): New function.
(cwd_hash): New function.
(cwd_fixup_after_exec): New function.
* path.h: Accomodate path.cc changes.
* pinfo.cc (pinfo_init): Accept a pointer to an environment table. Pass this
to environ_init. Eliminate old 'title' tests.
* pinfo.h: Accomodate above change in argument.
* spawn.cc (struct av): New method for building argv list.
(av::unshift): New method.
(spawn_guts): Allocate everything that the child process needs in the cygwin
heap and pass a pointer to this to the child. Build argv list using new
method. Eliminate delinearize stuff.
* thread.h: Eliminate _cwd_win32 and _cwd_posix buffers.
* winsup.h: Eliminate obsolete functions. Add envsize() declaration.
Diffstat (limited to 'winsup/cygwin/uinfo.cc')
-rw-r--r-- | winsup/cygwin/uinfo.cc | 232 |
1 files changed, 116 insertions, 116 deletions
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index fc3f8bf40..a0f9ae82d 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -40,130 +40,130 @@ internal_getlogin (_pinfo *pi) /* First trying to get logon info from environment */ if ((env = getenv ("USERNAME")) != NULL) - un = env; + un = env; if ((env = getenv ("LOGONSERVER")) != NULL) - strcpy (pi->logsrv, env + 2); /* filter leading double backslashes */ + strcpy (pi->logsrv, env + 2); /* filter leading double backslashes */ if ((env = getenv ("USERDOMAIN")) != NULL) - strcpy (pi->domain, env); + strcpy (pi->domain, env); /* Trust only if usernames are identical */ if (un && strcasematch (pi->username, un) - && pi->domain[0] && pi->logsrv[0]) - debug_printf ("Domain: %s, Logon Server: %s", pi->domain, pi->logsrv); + && pi->domain[0] && pi->logsrv[0]) + debug_printf ("Domain: %s, Logon Server: %s", pi->domain, pi->logsrv); /* If that failed, try to get that info from NetBIOS */ else if (!NetWkstaUserGetInfo (NULL, 1, (LPBYTE *)&wui)) - { - sys_wcstombs (pi->username, wui->wkui1_username, MAX_USER_NAME); - sys_wcstombs (pi->logsrv, wui->wkui1_logon_server, MAX_HOST_NAME); - sys_wcstombs (pi->domain, wui->wkui1_logon_domain, - MAX_COMPUTERNAME_LENGTH + 1); - /* Save values in environment */ - if (!strcasematch (pi->username, "SYSTEM") - && pi->domain[0] && pi->logsrv[0]) - { - LPUSER_INFO_3 ui = NULL; - WCHAR wbuf[MAX_HOST_NAME + 2]; + { + sys_wcstombs (pi->username, wui->wkui1_username, MAX_USER_NAME); + sys_wcstombs (pi->logsrv, wui->wkui1_logon_server, MAX_HOST_NAME); + sys_wcstombs (pi->domain, wui->wkui1_logon_domain, + MAX_COMPUTERNAME_LENGTH + 1); + /* Save values in environment */ + if (!strcasematch (pi->username, "SYSTEM") + && pi->domain[0] && pi->logsrv[0]) + { + LPUSER_INFO_3 ui = NULL; + WCHAR wbuf[MAX_HOST_NAME + 2]; - strcat (strcpy (buf, "\\\\"), pi->logsrv); - setenv ("USERNAME", pi->username, 1); - setenv ("LOGONSERVER", buf, 1); - setenv ("USERDOMAIN", pi->domain, 1); - /* HOMEDRIVE and HOMEPATH are wrong most of the time, too, - after changing user context! */ - sys_mbstowcs (wbuf, buf, MAX_HOST_NAME + 2); - if (!NetUserGetInfo (NULL, wui->wkui1_username, 3, (LPBYTE *)&ui) - || !NetUserGetInfo (wbuf,wui->wkui1_username,3,(LPBYTE *)&ui)) - { - sys_wcstombs (buf, ui->usri3_home_dir, MAX_PATH); - if (!buf[0]) - { - sys_wcstombs (buf, ui->usri3_home_dir_drive, MAX_PATH); - if (buf[0]) - strcat (buf, "\\"); - else - { - env = getenv ("SYSTEMDRIVE"); - if (env && *env) - strcat (strcpy (buf, env), "\\"); - else - GetSystemDirectoryA (buf, MAX_PATH); - } - } - setenv ("HOMEPATH", buf + 2, 1); - buf[2] = '\0'; - setenv ("HOMEDRIVE", buf, 1); - NetApiBufferFree (ui); - } - } - debug_printf ("Domain: %s, Logon Server: %s, Windows Username: %s", - pi->domain, pi->logsrv, pi->username); - NetApiBufferFree (wui); - } + strcat (strcpy (buf, "\\\\"), pi->logsrv); + setenv ("USERNAME", pi->username, 1); + setenv ("LOGONSERVER", buf, 1); + setenv ("USERDOMAIN", pi->domain, 1); + /* HOMEDRIVE and HOMEPATH are wrong most of the time, too, + after changing user context! */ + sys_mbstowcs (wbuf, buf, MAX_HOST_NAME + 2); + if (!NetUserGetInfo (NULL, wui->wkui1_username, 3, (LPBYTE *)&ui) + || !NetUserGetInfo (wbuf,wui->wkui1_username,3,(LPBYTE *)&ui)) + { + sys_wcstombs (buf, ui->usri3_home_dir, MAX_PATH); + if (!buf[0]) + { + sys_wcstombs (buf, ui->usri3_home_dir_drive, MAX_PATH); + if (buf[0]) + strcat (buf, "\\"); + else + { + env = getenv ("SYSTEMDRIVE"); + if (env && *env) + strcat (strcpy (buf, env), "\\"); + else + GetSystemDirectoryA (buf, MAX_PATH); + } + } + setenv ("HOMEPATH", buf + 2, 1); + buf[2] = '\0'; + setenv ("HOMEDRIVE", buf, 1); + NetApiBufferFree (ui); + } + } + debug_printf ("Domain: %s, Logon Server: %s, Windows Username: %s", + pi->domain, pi->logsrv, pi->username); + NetApiBufferFree (wui); + } if (allow_ntsec) - { - HANDLE ptok = pi->token; /* Which is INVALID_HANDLE_VALUE if no - impersonation took place. */ - DWORD siz; - char tu[1024]; - int ret = 0; - - /* Try to get the SID either from already impersonated token - or from current process first. To differ that two cases is - important, because you can't rely on the user information - in a process token of a currently impersonated process. */ - if (ptok == INVALID_HANDLE_VALUE - && !OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY, &ptok)) - debug_printf ("OpenProcessToken(): %E\n"); - else if (!GetTokenInformation (ptok, TokenUser, (LPVOID) &tu, - sizeof tu, &siz)) - debug_printf ("GetTokenInformation(): %E"); - else if (!(ret = CopySid (MAX_SID_LEN, (PSID) pi->psid, - ((TOKEN_USER *) &tu)->User.Sid))) - debug_printf ("Couldn't retrieve SID from access token!"); - /* Close token only if it's a result from OpenProcessToken(). */ - if (ptok != INVALID_HANDLE_VALUE && pi->token == INVALID_HANDLE_VALUE) - CloseHandle (ptok); + { + HANDLE ptok = pi->token; /* Which is INVALID_HANDLE_VALUE if no + impersonation took place. */ + DWORD siz; + char tu[1024]; + int ret = 0; + + /* Try to get the SID either from already impersonated token + or from current process first. To differ that two cases is + important, because you can't rely on the user information + in a process token of a currently impersonated process. */ + if (ptok == INVALID_HANDLE_VALUE + && !OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY, &ptok)) + debug_printf ("OpenProcessToken(): %E\n"); + else if (!GetTokenInformation (ptok, TokenUser, (LPVOID) &tu, + sizeof tu, &siz)) + debug_printf ("GetTokenInformation(): %E"); + else if (!(ret = CopySid (MAX_SID_LEN, (PSID) pi->psid, + ((TOKEN_USER *) &tu)->User.Sid))) + debug_printf ("Couldn't retrieve SID from access token!"); + /* Close token only if it's a result from OpenProcessToken(). */ + if (ptok != INVALID_HANDLE_VALUE && pi->token == INVALID_HANDLE_VALUE) + CloseHandle (ptok); - /* If that failes, try to get the SID from localhost. This can only - be done if a domain is given because there's a chance that a local - and a domain user may have the same name. */ - if (!ret && pi->domain[0]) - { - /* Concat DOMAIN\USERNAME for the next lookup */ - strcat (strcat (strcpy (buf, pi->domain), "\\"), pi->username); - if (!(ret = lookup_name (buf, NULL, (PSID) pi->psid))) - debug_printf ("Couldn't retrieve SID locally!"); - } + /* If that failes, try to get the SID from localhost. This can only + be done if a domain is given because there's a chance that a local + and a domain user may have the same name. */ + if (!ret && pi->domain[0]) + { + /* Concat DOMAIN\USERNAME for the next lookup */ + strcat (strcat (strcpy (buf, pi->domain), "\\"), pi->username); + if (!(ret = lookup_name (buf, NULL, (PSID) pi->psid))) + debug_printf ("Couldn't retrieve SID locally!"); + } - /* If that failes, too, as a last resort try to get the SID from - the logon server. */ - if (!ret && !(ret = lookup_name(pi->username, pi->logsrv, - (PSID)pi->psid))) - debug_printf ("Couldn't retrieve SID from '%s'!", pi->logsrv); + /* If that failes, too, as a last resort try to get the SID from + the logon server. */ + if (!ret && !(ret = lookup_name(pi->username, pi->logsrv, + (PSID)pi->psid))) + debug_printf ("Couldn't retrieve SID from '%s'!", pi->logsrv); - /* If we have a SID, try to get the corresponding Cygwin user name - which can be different from the Windows user name. */ - if (ret) - { - struct passwd *pw; - char psidbuf[MAX_SID_LEN]; - PSID psid = (PSID) psidbuf; + /* If we have a SID, try to get the corresponding Cygwin user name + which can be different from the Windows user name. */ + if (ret) + { + struct passwd *pw; + char psidbuf[MAX_SID_LEN]; + PSID psid = (PSID) psidbuf; - pi->use_psid = 1; - if (!strcasematch (pi->username, "SYSTEM") - && pi->domain[0] && pi->logsrv[0]) - { - if (get_registry_hive_path (pi->psid, buf)) - setenv ("USERPROFILE", buf, 1); - } - while ((pw = getpwent ()) != NULL) - if (get_pw_sid (psid, pw) && EqualSid (pi->psid, psid)) - { - strcpy (pi->username, pw->pw_name); - break; - } - endpwent (); - } - } + pi->use_psid = 1; + if (!strcasematch (pi->username, "SYSTEM") + && pi->domain[0] && pi->logsrv[0]) + { + if (get_registry_hive_path (pi->psid, buf)) + setenv ("USERPROFILE", buf, 1); + } + while ((pw = getpwent ()) != NULL) + if (get_pw_sid (psid, pw) && EqualSid (pi->psid, psid)) + { + strcpy (pi->username, pw->pw_name); + break; + } + endpwent (); + } + } } debug_printf ("Cygwins Username: %s", pi->username); return pi->username; @@ -187,13 +187,13 @@ uinfo_init () if (myself->uid == USHRT_MAX) if ((p = getpwnam (username = internal_getlogin (myself))) != NULL) { - myself->uid = p->pw_uid; - myself->gid = p->pw_gid; + myself->uid = p->pw_uid; + myself->gid = p->pw_gid; } else { - myself->uid = DEFAULT_UID; - myself->gid = DEFAULT_GID; + myself->uid = DEFAULT_UID; + myself->gid = DEFAULT_GID; } /* Real and effective uid/gid are always identical on process start up. This is at least true for NT/W2K. */ |