diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2000-11-15 00:13:09 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2000-11-15 00:13:09 +0000 |
| commit | 1f0f8e127c6a6fd7520ebc08eb2f479507247d5f (patch) | |
| tree | 8ae38247dfc47ad5ebfdc0b5f8c93d700179deb0 /winsup/cygwin/spawn.cc | |
| parent | fe8c097112ab4e2cd2c369b484561c0bd4ce4b75 (diff) | |
| download | cygnal-1f0f8e127c6a6fd7520ebc08eb2f479507247d5f.tar.gz cygnal-1f0f8e127c6a6fd7520ebc08eb2f479507247d5f.tar.bz2 cygnal-1f0f8e127c6a6fd7520ebc08eb2f479507247d5f.zip | |
* cygheap.cc (cygheap_root::cygheap_root): New function.
(cygheap_root::~cygheap_root): Ditto.
(cygheap_root::operator=): Ditto.
(cygheap_user::~cygheap_user): Ditto.
(cygheap_user::set_name): Ditto.
(cygheap_user::set_logsrv): Ditto.
(cygheap_user::set_domain): Ditto.
(cygheap_user::set_sid): Ditto.
* cygheap.h (cygheap_root): New class.
(cygheap_user): Ditto.
(init_cygheap): Change type of `root' member to cygheap_root.
Add `user' member.
* dir.cc (opendir): Use new `cygheap_root' class.
* dcrt0.cc (dll_crt0_1): Use new `cygheap_user' class.
* fork.cc (fork_parent): Ditto.
* grp.cc (getgroups): Ditto.
* passwd.cc (search_for): Ditto.
* path.cc: Use new `cygheap_root' class throughout.
* pinfo.h (_pinfo): Remove `use_psid'. Move `username', `psid',
`logsrv', `domain', `orig_{uid,gid}' and `real_{uid,gid}' to
cygheap_user class.
* security.cc: Use new `cygheap_user' class throughout.
* shared.cc (sec_user): Ditto.
* sigproc.cc (proc_subproc): Remove copy statements for user
related information moved to `cygheap_user' class.
* spawn.cc (spawn_guts): Invalidate current chroot settings
when creating Windows environment. Use new `cygheap_user' class.
* syscalls.cc: Use new `cygheap_user' class throughout.
* uinfo.cc: Ditto.
* uinfo.cc (internal_getlogin): Change parameters to reflect the
move of user information to cygheap.
Diffstat (limited to 'winsup/cygwin/spawn.cc')
| -rw-r--r-- | winsup/cygwin/spawn.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index e17541446..7dc193c48 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -554,7 +554,12 @@ skip_arg_parsing: if (real_path.iscygexec ()) envblock = NULL; else - envblock = winenv (envp, 0); + { + cygheap_root sav_root (cygheap->root); + cygheap->root = NULL; + envblock = winenv (envp, 0); + cygheap->root = sav_root; + } ciresrv.cygheap = cygheap; ciresrv.cygheap_max = cygheap_max; @@ -625,7 +630,7 @@ skip_arg_parsing: /* Remove impersonation */ uid_t uid = geteuid(); if (myself->impersonated && myself->token != INVALID_HANDLE_VALUE) - seteuid (myself->orig_uid); + seteuid (cygheap->user.orig_uid); /* Load users registry hive. */ load_registry_hive (sid); @@ -705,7 +710,6 @@ skip_arg_parsing: syscall_printf ("-1 = spawnve (), process table full"); return -1; } - child->username[0] = '\0'; child->progname[0] = '\0'; child->dwProcessId = pi.dwProcessId; child->hProcess = pi.hProcess; |