diff --git a/patches/02-ACL_Extended_Attributes/0004-server-Retrieve-file-security-attributes-with-extend.patch b/patches/02-ACL_Extended_Attributes/0004-server-Retrieve-file-security-attributes-with-extend.patch index 59e1d31c..21f4915b 100644 --- a/patches/02-ACL_Extended_Attributes/0004-server-Retrieve-file-security-attributes-with-extend.patch +++ b/patches/02-ACL_Extended_Attributes/0004-server-Retrieve-file-security-attributes-with-extend.patch @@ -1,6 +1,6 @@ -From 66583f9f848becaa12d84270a2ebe7a79ac34724 Mon Sep 17 00:00:00 2001 +From 2d625c28a1d39e093adcf0059815082e6995666e Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" -Date: Thu, 13 Feb 2014 16:04:57 -0700 +Date: Tue, 15 Apr 2014 14:31:43 -0600 Subject: server: Retrieve file security attributes with extended file attributes. @@ -10,7 +10,7 @@ Subject: server: Retrieve file security attributes with extended file 2 files changed, 177 insertions(+), 28 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c -index e2e9cd5..f107abc 100644 +index bd45189..e5ef7e6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3105,24 +3105,24 @@ static void test_CreateDirectoryA(void) @@ -110,10 +110,10 @@ index e2e9cd5..f107abc 100644 CloseHandle(obj); } diff --git a/server/file.c b/server/file.c -index c375c72..b9135b9 100644 +index 40013b1..77da72e 100644 --- a/server/file.c +++ b/server/file.c -@@ -489,11 +489,160 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID +@@ -487,12 +487,161 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID return sd; } @@ -269,12 +269,13 @@ index c375c72..b9135b9 100644 uid_t *uid ) { int unix_fd = get_unix_fd( fd ); + struct stat st; struct security_descriptor *sd; + const SID *user, *group; - struct stat st; if (unix_fd == -1 || fstat( unix_fd, &st ) == -1) -@@ -504,9 +653,10 @@ struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mo + return obj->sd; +@@ -502,9 +651,10 @@ struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mo (st.st_uid == *uid)) return obj->sd;