wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5a1d836def24043b4e7afcdc8cf1342223957edf.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "08c6114fbbdabe1873731356c51716e513a26348"
echo "5a1d836def24043b4e7afcdc8cf1342223957edf"
}
# Show version information
@ -3262,11 +3262,8 @@ fi
# | This patchset has the following (direct or indirect) dependencies:
# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Junction_Points
# |
# | This patchset fixes the following Wine bugs:
# | * [#44691] Improve mapping of DACL to file permissions
# |
# | Modified files:
# | * dlls/advapi32/tests/security.c, dlls/ntdll/tests/file.c, server/fd.c, server/file.c
# | * dlls/advapi32/tests/security.c, dlls/ntdll/tests/file.c, server/fd.c
# |
if test "$enable_server_File_Permissions" -eq 1; then
patch_apply server-File_Permissions/0001-server-Improve-STATUS_CANNOT_DELETE-checks-for-direc.patch
@ -3276,7 +3273,6 @@ if test "$enable_server_File_Permissions" -eq 1; then
patch_apply server-File_Permissions/0005-advapi32-tests-Add-ACL-inheritance-tests-for-creatin.patch
patch_apply server-File_Permissions/0006-ntdll-tests-Added-tests-for-open-behaviour-on-readon.patch
patch_apply server-File_Permissions/0007-server-FILE_WRITE_ATTRIBUTES-should-succeed-for-read.patch
patch_apply server-File_Permissions/0008-server-Improve-mapping-of-DACL-to-file-permissions.patch
fi
# Patchset server-Stored_ACLs

38
patches/server-File_Permissions/0008-server-Improve-mapping-of-DACL-to-file-permissions.patch
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

1
patches/server-File_Permissions/definition
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

2
staging/upstream-commit
View File

@ -1 +1 @@
08c6114fbbdabe1873731356c51716e513a26348
5a1d836def24043b4e7afcdc8cf1342223957edf