wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated patchset for ObjectTypeInformation and fix typename for various additional wineserver object types.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-06-03 18:32:16 +02:00
parent 32f681f893
commit 2412d1f4eb
10 changed files with 355 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server-ACL_Compat/0001-server-Add-compatibility-code-for-handling-the-old-m.patch
View File

@@ -1,4 +1,4 @@
From 5779586de8e1059d7f88edf45d5d9ed59eca1b46 Mon Sep 17 00:00:00 2001
From ded8679bb992d9d82bdeeb5a78b38100586906a0 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Fri, 18 Apr 2014 15:21:00 -0600
Subject: server: Add compatibility code for handling the old method of storing
@@ -9,7 +9,7 @@ Subject: server: Add compatibility code for handling the old method of storing
1 file changed, 167 insertions(+), 3 deletions(-)
diff --git a/server/file.c b/server/file.c
index 617c373..9adca0d 100644
index 6fbb71c..3b56a9b 100644
--- a/server/file.c
+++ b/server/file.c
@@ -72,6 +72,7 @@ struct file
@@ -19,8 +19,8 @@ index 617c373..9adca0d 100644
+static struct security_descriptor *get_xattr_acls( int fd, const SID *user, const SID *group );
static void file_dump( struct object *obj, int verbose );
static struct fd *file_get_fd( struct object *obj );
@@ -308,6 +309,7 @@ static struct security_descriptor *file_get_parent_sd( struct fd *root, const ch
static struct object_type *file_get_type( struct object *obj );
@@ -313,6 +314,7 @@ static struct security_descriptor *file_get_parent_sd( struct fd *root, const ch
mode_t parent_mode = 0555;
char *p, *parent_name;
struct fd *parent_fd;
@@ -28,7 +28,7 @@ index 617c373..9adca0d 100644
int unix_fd;
if (!(parent_name = mem_alloc( child_len + 1 ))) return NULL;
@@ -340,6 +342,9 @@ static struct security_descriptor *file_get_parent_sd( struct fd *root, const ch
@@ -345,6 +347,9 @@ static struct security_descriptor *file_get_parent_sd( struct fd *root, const ch
if (unix_fd != -1)
{
parent_sd = get_xattr_sd( unix_fd );
@@ -38,7 +38,7 @@ index 617c373..9adca0d 100644
if (parent_sd)
{
sd = inherit_sd( parent_sd, is_dir );
@@ -623,6 +628,163 @@ static void convert_generic_sd( struct security_descriptor *sd )
@@ -636,6 +641,163 @@ static void convert_generic_sd( struct security_descriptor *sd )
}
}
@@ -202,7 +202,7 @@ index 617c373..9adca0d 100644
static struct security_descriptor *get_xattr_sd( int fd )
{
struct security_descriptor *sd;
@@ -652,6 +814,7 @@ struct security_descriptor *get_file_sd( struct object *obj, struct fd *fd, mode
@@ -665,6 +827,7 @@ struct security_descriptor *get_file_sd( struct object *obj, struct fd *fd, mode
int unix_fd = get_unix_fd( fd );
struct stat st;
struct security_descriptor *sd;
@@ -210,7 +210,7 @@ index 617c373..9adca0d 100644
if (unix_fd == -1 || fstat( unix_fd, &st ) == -1)
return obj->sd;
@@ -661,10 +824,11 @@ struct security_descriptor *get_file_sd( struct object *obj, struct fd *fd, mode
@@ -674,10 +837,11 @@ struct security_descriptor *get_file_sd( struct object *obj, struct fd *fd, mode
(st.st_uid == *uid))
return obj->sd;
@@ -226,5 +226,5 @@ index 617c373..9adca0d 100644
*mode = st.st_mode;
--
2.3.5
2.4.2