From c61ada9bd3d29734cce244a5cd39ec2cc5882454 Mon Sep 17 00:00:00 2001 From: Pierre Humblet Date: Tue, 16 Sep 2003 00:45:50 +0000 Subject: 2003-09-15 Pierre Humblet * security.h (__sec_user): Add "access2" argument. (sec_acl): Add "original" and "access2" arguments. (sec_user): Add "sid2" and "access2" argument. Remove dependence on allow_ntsec. (sec_user_nih): Ditto. * sec_helper.cc (__sec_user): Add "has_security" test. Call sec_acl with new arguments, letting it handle original_sid. (sec_acl): Add "original" and "access2" arguments. Handle original_sid depending on flag but avoiding duplicates. Use "access2" for sid2. * pinfo.cc (pinfo::init): Use security attributes created by sec_user when creating the mapping. * security.cc (create_token): Adjust arguments in call to sec_acl. Call sec_user instead of __sec_user. * syscall.cc (seteuid32): Adjust arguments in call to sec_acl. Remove now unnecessary test. Remove useless conversions to psid. * dcrt0.cc (dll_crt0_1): Call cygsid::init before pinfo_init. --- winsup/cygwin/security.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/security.cc') diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index d76964f91..d81d8ab72 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -906,7 +906,7 @@ create_token (cygsid &usersid, user_groups &new_groups, struct passwd *pw) goto out; /* Create default dacl. */ - if (!sec_acl ((PACL) acl_buf, FALSE, + if (!sec_acl ((PACL) acl_buf, false, false, tmp_gsids.contains (well_known_admins_sid) ? well_known_admins_sid : usersid)) goto out; @@ -926,7 +926,7 @@ create_token (cygsid &usersid, user_groups &new_groups, struct passwd *pw) else { /* Set security descriptor and primary group */ - psa = __sec_user (sa_buf, usersid, TRUE); + psa = sec_user (sa_buf, usersid); if (psa->lpSecurityDescriptor && !SetSecurityDescriptorGroup ((PSECURITY_DESCRIPTOR) psa->lpSecurityDescriptor, -- cgit v1.2.3