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

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

View File

@@ -1,4 +1,4 @@
From a6f078d87958db4e0eb404e7f7cc2d603b92869c Mon Sep 17 00:00:00 2001
From ae940533d113a6419605d09c874561af4cd292d4 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Fri, 18 Apr 2014 14:08:36 -0600
Subject: server: Inherit security attributes from parent directories on
@@ -10,7 +10,7 @@ Subject: server: Inherit security attributes from parent directories on
2 files changed, 141 insertions(+), 4 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 945542e..403c637 100644
index a85bb38..7be1db6 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -3280,7 +3280,7 @@ static void test_CreateDirectoryA(void)
@@ -50,7 +50,7 @@ index 945542e..403c637 100644
CloseHandle(hTemp);
diff --git a/server/file.c b/server/file.c
index 8bcf6ee..617c373 100644
index 49f193d..6fbb71c 100644
--- a/server/file.c
+++ b/server/file.c
@@ -71,6 +71,7 @@ struct file
@@ -60,8 +60,8 @@ index 8bcf6ee..617c373 100644
+static struct security_descriptor *get_xattr_sd( int fd );
static void file_dump( struct object *obj, int verbose );
static struct fd *file_get_fd( struct object *obj );
@@ -220,11 +221,142 @@ static void set_xattr_sd( int fd, const struct security_descriptor *sd )
static struct object_type *file_get_type( struct object *obj );
@@ -225,11 +226,142 @@ static void set_xattr_sd( int fd, const struct security_descriptor *sd )
xattr_fset( fd, WINE_XATTR_SD, buffer, len );
}
@@ -204,7 +204,7 @@ index 8bcf6ee..617c373 100644
struct object *obj = NULL;
struct fd *fd;
int flags;
@@ -253,6 +385,10 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
@@ -258,6 +390,10 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
default: set_error( STATUS_INVALID_PARAMETER ); goto done;
}
@@ -215,7 +215,7 @@ index 8bcf6ee..617c373 100644
if (sd)
{
const SID *owner = sd_get_owner( sd );
@@ -292,6 +428,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
@@ -297,6 +433,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
release_object( fd );
done:
@@ -224,5 +224,5 @@ index 8bcf6ee..617c373 100644
return obj;
}
--
2.3.5
2.4.2

View File

@@ -1,2 +1,3 @@
Depends: server-Stored_ACLs
Depends: server-ObjectTypeInformation
Fixes: [34406] Support for inherited file ACLs