From 1f0f8e127c6a6fd7520ebc08eb2f479507247d5f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 15 Nov 2000 00:13:09 +0000 Subject: * 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. --- winsup/cygwin/cygheap.h | 59 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 5 deletions(-) (limited to 'winsup/cygwin/cygheap.h') diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index faa50bf12..779df67d3 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -39,15 +39,64 @@ struct _cmalloc_entry char data[0]; }; +class cygheap_root +{ + /* Root directory information. + This is used after a chroot is called. */ + size_t rootlen; + char *root; +public: + cygheap_root (cygheap_root &nroot); + ~cygheap_root (); + char *operator =(const char *new_root); + size_t length () const { return rootlen; } + const char *path () const { return root; } +}; + +class cygheap_user { + /* Extendend user information. + The information is derived from the internal_getlogin call + when on a NT system. */ + char *pname; /* user's name */ + char *plogsrv; /* Logon server, may be FQDN */ + char *pdomain; /* Logon domain of the user */ + PSID psid; /* buffer for user's SID */ + +public: + uid_t orig_uid; /* Remains intact even after impersonation */ + uid_t orig_gid; /* Ditto */ + uid_t real_uid; /* Remains intact on seteuid, replaced by setuid */ + gid_t real_gid; /* Ditto */ + + cygheap_user () : pname (NULL), plogsrv (NULL), pdomain (NULL), psid (NULL) {} + ~cygheap_user (); + + void set_name (const char *new_name); + const char *name () const { return pname; } + + void set_logsrv (const char *new_logsrv); + const char *logsrv () const { return plogsrv; } + + void set_domain (const char *new_domain); + const char *domain () const { return pdomain; } + + BOOL set_sid (PSID new_sid); + PSID sid () const { return psid; } + + void operator =(cygheap_user &user) + { + set_name (user.name ()); + set_logsrv (user.logsrv ()); + set_domain (user.domain ()); + set_sid (user.sid ()); + } +}; struct init_cygheap { _cmalloc_entry *chain; - struct - { - size_t rootlen; - char *root; - }; + cygheap_root root; + cygheap_user user; mode_t umask; }; -- cgit v1.2.3