Rebase against 5a1d836def24043b4e7afcdc8cf1342223957edf.

This commit is contained in:
Zebediah Figura
2021-04-22 16:49:07 -05:00
parent 68f87944cf
commit 7eb07f1d50
4 changed files with 3 additions and 46 deletions

View File

@@ -1,38 +0,0 @@
From ae6b499cc82a4af467274ec1553b96aebdf077b6 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 13 Jan 2017 00:58:17 +0100
Subject: [PATCH] server: Map group SIDs to Unix groups even if the owner
doesn't match the current user.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44691
---
server/file.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/server/file.c b/server/file.c
index 32cdec74d5a..3a0893d3b12 100644
--- a/server/file.c
+++ b/server/file.c
@@ -497,8 +497,7 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner )
{
bits_to_set &= ~((mode << 6) | (mode << 3) | mode); /* all */
}
- else if ((security_equal_sid( user, owner ) &&
- token_sid_present( current->process->token, sid, TRUE )))
+ else if (token_sid_present( current->process->token, sid, TRUE ))
{
bits_to_set &= ~((mode << 6) | (mode << 3)); /* user + group */
}
@@ -517,8 +516,7 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner )
new_mode |= mode & bits_to_set;
bits_to_set &= ~mode;
}
- else if ((security_equal_sid( user, owner ) &&
- token_sid_present( current->process->token, sid, FALSE )))
+ else if (token_sid_present( current->process->token, sid, FALSE ))
{
mode = (mode << 6) | (mode << 3); /* user + group */
new_mode |= mode & bits_to_set;
--
2.30.2

View File

@@ -1,3 +1,2 @@
Fixes: Allow to open files/directories without any access rights in order to query attributes
Fixes: [44691] Improve mapping of DACL to file permissions
Depends: ntdll-Junction_Points