diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-06-16 23:34:43 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-06-16 23:34:43 +0000 |
| commit | e40670ee488a5dcea90a57efb58ecd04ee39a302 (patch) | |
| tree | f56b9f45a0723b621407cd4e009be6ef54f32a26 /winsup/cygwin/fork.cc | |
| parent | 45e9463a38af63cd024f3a568b9c61be4df2b0d1 (diff) | |
| download | cygnal-e40670ee488a5dcea90a57efb58ecd04ee39a302.tar.gz cygnal-e40670ee488a5dcea90a57efb58ecd04ee39a302.tar.bz2 cygnal-e40670ee488a5dcea90a57efb58ecd04ee39a302.zip | |
* cygheap.h (cygheap_user::issetuid): New method.
* dtable.cc (dtable::vfork_child_dup): Use new method to determine if we are in
"setuid mode."
* fork.cc (fork_parent): Ditto.
* spawn.cc (spawn_guts): Ditto.
* syscalls.cc (seteuid32): Ditto.
(setegid32): Ditto.
* environ.cc (spenv::retrieve): (Suggested by Pierre Humblet) Do potential
recalculation of cygheap_user stuff when in setuid mode. Return special value
when environment variable exists but should not be added.
(build_env): Don't add retrieved value to dstp if it is 'dont_add'.
Diffstat (limited to 'winsup/cygwin/fork.cc')
| -rw-r--r-- | winsup/cygwin/fork.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index 7a7cac0ba..e6fb91037 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -441,7 +441,7 @@ fork_parent (HANDLE& hParent, dll *&first_dll, si.cbReserved2 = sizeof(ch); /* Remove impersonation */ - if (cygheap->user.impersonated && cygheap->user.token != INVALID_HANDLE_VALUE) + if (cygheap->user.issetuid ()) RevertToSelf (); ch.parent = hParent; @@ -490,8 +490,7 @@ fork_parent (HANDLE& hParent, dll *&first_dll, ForceCloseHandle(subproc_ready); ForceCloseHandle(forker_finished); /* Restore impersonation */ - if (cygheap->user.impersonated - && cygheap->user.token != INVALID_HANDLE_VALUE) + if (cygheap->user.issetuid ()) ImpersonateLoggedOnUser (cygheap->user.token); cygheap_setup_for_child_cleanup (newheap, &ch, 0); return -1; @@ -519,7 +518,7 @@ fork_parent (HANDLE& hParent, dll *&first_dll, strcpy(forked->progname, myself->progname); /* Restore impersonation */ - if (cygheap->user.impersonated && cygheap->user.token != INVALID_HANDLE_VALUE) + if (cygheap->user.issetuid ()) ImpersonateLoggedOnUser (cygheap->user.token); ProtectHandle (pi.hThread); |