* 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.
This commit is contained in:
@ -29,6 +29,7 @@ details. */
|
||||
#include "sync.h"
|
||||
#include "sigproc.h"
|
||||
#include "pinfo.h"
|
||||
#include "cygheap.h"
|
||||
#include "security.h"
|
||||
|
||||
extern BOOL allow_ntea;
|
||||
@ -326,7 +327,7 @@ is_grp_member (uid_t uid, gid_t gid)
|
||||
gid_t grps[NGROUPS_MAX];
|
||||
int cnt = getgroups (NGROUPS_MAX, grps,
|
||||
pw ? pw->pw_gid : myself->gid,
|
||||
pw ? pw->pw_name : myself->username);
|
||||
pw ? pw->pw_name : cygheap->user.name ());
|
||||
int i;
|
||||
for (i = 0; i < cnt; ++i)
|
||||
if (grps[i] == gid)
|
||||
@ -352,9 +353,9 @@ lookup_name (const char *name, const char *logsrv, PSID ret_sid)
|
||||
if (! name)
|
||||
return FALSE;
|
||||
|
||||
if (*myself->domain)
|
||||
if (cygheap->user.domain ())
|
||||
{
|
||||
strcat (strcat (strcpy (domuser, myself->domain), "\\"), name);
|
||||
strcat (strcat (strcpy (domuser, cygheap->user.domain ()), "\\"), name);
|
||||
if (LookupAccountName (NULL, domuser,
|
||||
sid, (sidlen = MAX_SID_LEN, &sidlen),
|
||||
dom, (domlen = MAX_COMPUTERNAME_LENGTH, &domlen),
|
||||
@ -1138,7 +1139,7 @@ set_file_attribute (int use_ntsec, const char *file, int attribute)
|
||||
{
|
||||
return set_file_attribute (use_ntsec, file,
|
||||
myself->uid, myself->gid,
|
||||
attribute, myself->logsrv);
|
||||
attribute, cygheap->user.logsrv ());
|
||||
}
|
||||
|
||||
static int
|
||||
|
Reference in New Issue
Block a user