From d6ffc075889f79a600ed2ef0998a7b969d4b51db Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 10 Dec 2002 12:43:49 +0000 Subject: 2002-12-10 Pierre Humblet * pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by pwdgrp_check::isinitializing (). (pwdgrp_check::isinitializing): Create. * passwd.cc (grab_int): Change type to unsigned, use strtoul and set the pointer content to 0 if the field is invalid. (parse_pwd): Move validity test after getting pw_gid. (read_etc_passwd): Replace "passwd_state <= " by passwd_state::isinitializing (). (internal_getpwuid): Ditto. (internal_getpwnam): Ditto. (getpwent): Ditto. (getpass): Ditto. * grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity. (read_etc_group): Replace "group_state <= " by group_state::isinitializing (). (internal_getgrgid): Ditto. (getgrent32): Ditto. (internal_getgrent): Ditto. 2002-12-10 Pierre Humblet * security.h: Move declarations of internal_getgrent, internal_getpwsid and internal_getgrsid to pwdgrp.h. * pwdgrp.h: Declare internal_getpwsid, internal_getpwnam, internal_getpwuid, internal_getgrsid, internal_getgrgid, internal_getgrnam, internal_getgrent and internal_getgroups. Delete "emulated" from enum pwdgrp_state. (pwdgrp_check::isuninitialized): Create. (pwdgrp_check::pwdgrp_state): Change state to initializing rather than to uninitialized. (pwdgrp_read::gets): Remove trailing CRs. * passwd.cc (grab_string): Don't look for NLs. (grab_int): Ditto. (parse_pwd): Don't look for CRs. Return 0 if entry is too short. (search_for): Delete. (read_etc_passwd): Simplify tests to actually read the file. Set state to loaded before making internal_getpwXX calls. Replace search_for calls by equivalent internal_pwgetXX calls. (internal_getpwsid): Use passwd_state.isuninitialized to decide to call read_etc_passwd. (internal_getpwuid): Create. (internal_getpwnam): Create. (getpwuid32): Simply call internal_getpwuid. (getpwuid_r32): Call internal_getpwuid. (getpwnam): Simply call internal_getpwnam. (getpwnam_r): Call internal_getpwnam. * grp.cc (parse_grp): Don't look for CRs. Adjust blank space. (add_grp_line): Adjust blank space. (class group_lock): Ditto. (read_etc_group): Simplify tests to actually read the file. Set state to loaded before making internal_getgrXX calls. Replace getgrXX calls by equivalent internal calls. (internal_getgrsid): Use group_state.isuninitialized to decide to call read_etc_group. (internal_getgrgid): Create. (internal_getgrnam): Create. (getgroups32): Simply call internal_getgrgid. (getgrnam32): Simply call internal_getgrnam. (internal_getgrent): Call group_state.isuninitialized. (internal_getgroups): Create from the former getgroups32, using two of the four arguments. Set gid to myself->gid and username to cygheap->user.name (). (getgroups32): Simply call internal_getgroup. (getgroups): Call internal_getgroup instead of getgroups32. (setgroups32): Call internal versions of get{pw,gr}XX. * sec_helper.cc: Include pwdgrp.h. (is_grp_member): Call internal versions of get{pw,gr}XX. * security.cc: Include pwdgrp.h. (alloc_sd): Call internal versions of get{pw,gr}XX. * syscalls.cc: Include pwdgrp.h. (seteuid32): Call internal versions of get{pw,gr}XX. (setegid32): Ditto. * uinfo.cc: Include pwdgrp.h. (internal_getlogin): Call internal versions of get{pw,gr}XX. (cygheap_user::ontherange): Ditto. * sec_acl.cc: Include pwdgrp.h. (setacl): Call internal versions of get{pw,gr}XX. (acl_access): Ditto and simplify logic. (aclfromtext): Ditto. --- winsup/cygwin/sec_acl.cc | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'winsup/cygwin/sec_acl.cc') diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc index 51ac03526..a928002c5 100644 --- a/winsup/cygwin/sec_acl.cc +++ b/winsup/cygwin/sec_acl.cc @@ -30,6 +30,7 @@ details. */ #include "dtable.h" #include "pinfo.h" #include "cygheap.h" +#include "pwdgrp.h" extern "C" int aclsort (int nentries, int, __aclent16_t *aclbufp); extern "C" int acl (const char *path, int cmd, int nentries, __aclent16_t *aclbufp); @@ -158,7 +159,7 @@ setacl (const char *file, int nentries, __aclent16_t *aclbufp) break; case USER: case DEF_USER: - if (!(pw = getpwuid32 (aclbufp[i].a_id)) + if (!(pw = internal_getpwuid (aclbufp[i].a_id)) || !sid.getfrompw (pw) || !add_access_allowed_ace (acl, ace_off++, allow, sid, acl_len, inheritance)) @@ -172,7 +173,7 @@ setacl (const char *file, int nentries, __aclent16_t *aclbufp) break; case GROUP: case DEF_GROUP: - if (!(gr = getgrgid32 (aclbufp[i].a_id)) + if (!(gr = internal_getgrgid (aclbufp[i].a_id)) || !sid.getfromgr (gr) || !add_access_allowed_ace (acl, ace_off++, allow, sid, acl_len, inheritance)) @@ -419,21 +420,15 @@ acl_access (const char *path, int flags) * Take SID from passwd, search SID in group, check is_grp_member. */ cygsid owner; - cygsid group; struct passwd *pw; struct __group32 *gr = NULL; - if ((pw = getpwuid32 (acls[i].a_id)) != NULL - && owner.getfrompw (pw)) - { - for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx) - if (group.getfromgr (gr) - && owner == group - && is_grp_member (myself->uid, gr->gr_gid)) - break; - } - if (!gr) - continue; + if ((pw = internal_getpwuid (acls[i].a_id)) != NULL + && owner.getfrompw (pw) + && (gr = internal_getgrsid (owner)) + && is_grp_member (myself->uid, gr->gr_gid)) + break; + continue; } break; case GROUP_OBJ: @@ -958,7 +953,7 @@ aclfromtext (char *acltextp, int *) c += 5; if (isalpha (*c)) { - struct passwd *pw = getpwnam (c); + struct passwd *pw = internal_getpwnam (c); if (!pw) { set_errno (EINVAL); @@ -986,7 +981,7 @@ aclfromtext (char *acltextp, int *) c += 5; if (isalpha (*c)) { - struct __group32 *gr = getgrnam32 (c); + struct __group32 *gr = internal_getgrnam (c); if (!gr) { set_errno (EINVAL); -- cgit v1.2.3