diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2000-11-15 03:13:09 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2000-11-15 03:13:09 +0300 |
commit | 1f0f8e127c6a6fd7520ebc08eb2f479507247d5f (patch) | |
tree | 8ae38247dfc47ad5ebfdc0b5f8c93d700179deb0 /winsup/cygwin/shared.cc | |
parent | fe8c097112ab4e2cd2c369b484561c0bd4ce4b75 (diff) |
* 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/shared.cc')
-rw-r--r-- | winsup/cygwin/shared.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index ee68c9b4a..fb023e725 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -17,6 +17,7 @@ details. */ #include "sync.h" #include "sigproc.h" #include "pinfo.h" +#include "cygheap.h" #include "shared_info.h" #include "registry.h" #include "cygwin_version.h" @@ -219,9 +220,9 @@ sec_user (PVOID sa_buf, PSID sid2, BOOL inherit) char sid_buf[MAX_SID_LEN]; PSID sid = (PSID) sid_buf; - if (myself->use_psid) - CopySid (MAX_SID_LEN, sid, myself->psid); - else if (! lookup_name (getlogin (), myself->logsrv, sid)) + if (cygheap->user.sid ()) + CopySid (MAX_SID_LEN, sid, (void *) cygheap->user.sid ()); + else if (! lookup_name (getlogin (), cygheap->user.logsrv (), sid)) return inherit ? &sec_none_nih : &sec_none; size_t acl_len = sizeof (ACL) |