* sec_helper.cc (security_descriptor::free): If sd_size is 0, call
LocalFree instead of ::free. * sec_acl.cc: Throughout replace old ACE flag definitions with current definitions as used in MSDN man pages. * security.cc: Ditto. * fhandler.cc (fhandler_base::open): Make sure file has really been just created before fixing file permissions. Add S_JUSTCREATED attribute to set_file_attribute call. * fhandler_disk_file.cc (fhandler_disk_file::mkdir): Always create dir with default security descriptor and fix descriptor afterwards. Add S_JUSTCREATED flag to set_file_attribute call. * fhandler_socket.cc (fhandler_socket::bind): Ditto for AF_LOCAL socket files. * path.cc (symlink_worker): Ditto for symlinks. * security.cc (get_file_sd): Call GetSecurityInfo rather than NtQuerySecurityObject. Explain why. Change error handling accordingly. (alloc_sd): Skip non-inherited, non-standard entries in ACL if S_JUSTCREATED attribute is set. Explain why. Minor format fixes. * security.h (S_JUSTCREATED): New define. (security_descriptor::operator=): New operator.
This commit is contained in:
@ -1463,14 +1463,6 @@ fhandler_disk_file::mkdir (mode_t mode)
|
||||
{
|
||||
int res = -1;
|
||||
SECURITY_ATTRIBUTES sa = sec_none_nih;
|
||||
security_descriptor sd;
|
||||
|
||||
/* See comments in fhander_base::open () for an explanation why we defer
|
||||
setting security attributes on remote files. */
|
||||
if (has_acls () && !pc.isremote ())
|
||||
set_security_attribute (pc, S_IFDIR | ((mode & 07777) & ~cygheap->umask),
|
||||
&sa, sd);
|
||||
|
||||
NTSTATUS status;
|
||||
HANDLE dir;
|
||||
OBJECT_ATTRIBUTES attr;
|
||||
@ -1505,9 +1497,10 @@ fhandler_disk_file::mkdir (mode_t mode)
|
||||
p, plen);
|
||||
if (NT_SUCCESS (status))
|
||||
{
|
||||
if (has_acls () && pc.isremote ())
|
||||
if (has_acls ())
|
||||
set_file_attribute (dir, pc, ILLEGAL_UID, ILLEGAL_GID,
|
||||
S_IFDIR | ((mode & 07777) & ~cygheap->umask));
|
||||
S_JUSTCREATED | S_IFDIR
|
||||
| ((mode & 07777) & ~cygheap->umask));
|
||||
NtClose (dir);
|
||||
res = 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user