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 02-ACL_Extended_Attributes patches.

Browse Source
This commit is contained in:
Sebastian Lackner 2014-05-04 01:32:57 +02:00
parent 807da03757
commit b09ed0f3d2
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/02-ACL_Extended_Attributes/0005-server-Retrieve-file-security-attributes-with-extend.patch
View File

@ -1,4 +1,4 @@
From e031dc5069bebd63770a405d684ee75a14d1826b Mon Sep 17 00:00:00 2001
From 4498c57f61bf85fca6eb17afd21c0c7051534f75 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Fri, 18 Apr 2014 14:01:35 -0600
Subject: server: Retrieve file security attributes with extended file
@ -11,7 +11,7 @@ Subject: server: Retrieve file security attributes with extended file
3 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index bd45189..e5ef7e6 100644
index a0574c4..26cde37 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -3105,24 +3105,24 @@ static void test_CreateDirectoryA(void)
@ -49,9 +49,9 @@ index bd45189..e5ef7e6 100644
+ todo_wine ok(ace->Mask == 0x1f01ff,
+ "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
}
LocalFree(pSD);
done:
@@ -3294,23 +3294,22 @@ static void test_GetNamedSecurityInfoA(void)
@@ -3297,23 +3297,22 @@ static void test_GetNamedSecurityInfoA(void)
bret = pGetAce(pDacl, 0, (VOID **)&ace);
ok(bret, "Failed to get Current User ACE.\n");
bret = EqualSid(&ace->SidStart, user_sid);
@ -81,7 +81,7 @@ index bd45189..e5ef7e6 100644
}
LocalFree(pSD);
HeapFree(GetProcessHeap(), 0, user);
@@ -3960,22 +3959,22 @@ static void test_GetSecurityInfo(void)
@@ -3963,22 +3962,22 @@ static void test_GetSecurityInfo(void)
bret = pGetAce(pDacl, 0, (VOID **)&ace);
ok(bret, "Failed to get Current User ACE.\n");
bret = EqualSid(&ace->SidStart, user_sid);
@ -108,8 +108,8 @@ index bd45189..e5ef7e6 100644
+ todo_wine ok(ace->Mask == 0x1f01ff,
+ "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
}
LocalFree(pSD);
CloseHandle(obj);
}
diff --git a/server/change.c b/server/change.c
index c391180..77c01bb 100644
--- a/server/change.c

16
patches/02-ACL_Extended_Attributes/0006-server-Convert-return-of-file-security-masks-with-ge.patch
View File

@ -1,4 +1,4 @@
From 74d97eda7172d7eae8468c7a32d4e330382afca2 Mon Sep 17 00:00:00 2001
From 689b660afba80654cde0a2dd6cf1d647a6e3705c Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Fri, 18 Apr 2014 14:05:32 -0600
Subject: server: Convert return of file security masks with generic access
@ -10,7 +10,7 @@ Subject: server: Convert return of file security masks with generic access
2 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index e5ef7e6..5b7e6a6 100644
index 26cde37..48a3291 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -3109,8 +3109,8 @@ static void test_CreateDirectoryA(void)
@ -33,9 +33,9 @@ index e5ef7e6..5b7e6a6 100644
+ ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
+ ace->Mask);
}
LocalFree(pSD);
done:
@@ -3297,8 +3297,8 @@ static void test_GetNamedSecurityInfoA(void)
@@ -3300,8 +3300,8 @@ static void test_GetNamedSecurityInfoA(void)
ok(bret, "Current User ACE != Current User SID.\n");
ok(((ACE_HEADER *)ace)->AceFlags == 0,
"Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
@ -46,7 +46,7 @@ index e5ef7e6..5b7e6a6 100644
}
if (acl_size.AceCount > 1)
{
@@ -3308,8 +3308,8 @@ static void test_GetNamedSecurityInfoA(void)
@@ -3311,8 +3311,8 @@ static void test_GetNamedSecurityInfoA(void)
ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n");
ok(((ACE_HEADER *)ace)->AceFlags == 0,
"Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
@ -57,7 +57,7 @@ index e5ef7e6..5b7e6a6 100644
}
LocalFree(pSD);
HeapFree(GetProcessHeap(), 0, user);
@@ -3962,8 +3962,8 @@ static void test_GetSecurityInfo(void)
@@ -3965,8 +3965,8 @@ static void test_GetSecurityInfo(void)
ok(bret, "Current User ACE != Current User SID.\n");
ok(((ACE_HEADER *)ace)->AceFlags == 0,
"Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
@ -68,7 +68,7 @@ index e5ef7e6..5b7e6a6 100644
}
if (acl_size.AceCount > 1)
{
@@ -3973,8 +3973,8 @@ static void test_GetSecurityInfo(void)
@@ -3976,8 +3976,8 @@ static void test_GetSecurityInfo(void)
ok(bret, "Administators Group ACE != Administators Group SID.\n");
ok(((ACE_HEADER *)ace)->AceFlags == 0,
"Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
@ -77,8 +77,8 @@ index e5ef7e6..5b7e6a6 100644
+ ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
+ ace->Mask);
}
LocalFree(pSD);
CloseHandle(obj);
}
diff --git a/server/file.c b/server/file.c
index c4706b6..75f015b 100644
--- a/server/file.c

8
patches/02-ACL_Extended_Attributes/0007-server-Inherit-security-attributes-from-parent-direc.patch
View File

@ -1,4 +1,4 @@
From fba93c12801c694d0e1248cd582c9d679e3a246a Mon Sep 17 00:00:00 2001
From c6052d785f4419a80ca091d978ee1ff3e7400ca9 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
@ -12,7 +12,7 @@ Subject: server: Inherit security attributes from parent directories on
4 files changed, 179 insertions(+), 6 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 5b7e6a6..68b63a0 100644
index 48a3291..f3a3c09 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -3030,10 +3030,11 @@ static void test_CreateDirectoryA(void)
@ -28,9 +28,9 @@ index 5b7e6a6..68b63a0 100644
DWORD error;
PACL pDacl;
@@ -3125,6 +3126,43 @@ static void test_CreateDirectoryA(void)
ace->Mask);
@@ -3126,6 +3127,43 @@ static void test_CreateDirectoryA(void)
}
LocalFree(pSD);
+ /* Test inheritance of ACLs */
+ strcpy(tmpfile, tmpdir);