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

Rebase against abaddc871842ba4ec0156f4bfed9939b44052ee4.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-06-20 13:55:21 +02:00
parent 0a16521c7e
commit 83a65ef99b
20 changed files with 171 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
View File

@@ -1,4 +1,4 @@
From 2380d7451dc978cdab3ebcbeb75272c9147d0f68 Mon Sep 17 00:00:00 2001
From 8bffcd9ad57c8c1b13f38045585043b7003c7c0c Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Wed, 25 Jun 2014 11:49:12 -0600
Subject: server: Add default security descriptor ownership for processes.
@@ -11,10 +11,10 @@ Subject: server: Add default security descriptor ownership for processes.
4 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 498d19a..c09b097 100644
index ca5edffae5..acbf124be8 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -4303,11 +4303,15 @@ static void test_acls(void)
@@ -4542,11 +4542,15 @@ static void test_acls(void)
static void test_GetSecurityInfo(void)
{
@@ -30,7 +30,7 @@ index 498d19a..c09b097 100644
ACL_SIZE_INFORMATION acl_size;
PSECURITY_DESCRIPTOR pSD;
ACCESS_ALLOWED_ACE *ace;
@@ -4434,6 +4438,37 @@ static void test_GetSecurityInfo(void)
@@ -4673,6 +4677,37 @@ static void test_GetSecurityInfo(void)
}
LocalFree(pSD);
CloseHandle(obj);
@@ -69,7 +69,7 @@ index 498d19a..c09b097 100644
static void test_GetSidSubAuthority(void)
diff --git a/server/process.c b/server/process.c
index d51c884..14e36b0 100644
index 2327a2664b..de6b1ed020 100644
--- a/server/process.c
+++ b/server/process.c
@@ -62,6 +62,7 @@ static int shutdown_stage; /* current stage in the shutdown process */
@@ -89,7 +89,7 @@ index d51c884..14e36b0 100644
default_set_sd, /* set_sd */
no_lookup_name, /* lookup_name */
no_link_name, /* link_name */
@@ -664,6 +665,29 @@ static unsigned int process_map_access( struct object *obj, unsigned int access
@@ -671,6 +672,29 @@ static unsigned int process_map_access( struct object *obj, unsigned int access
return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL);
}
@@ -120,7 +120,7 @@ index d51c884..14e36b0 100644
{
struct process *process = get_fd_user( fd );
diff --git a/server/security.h b/server/security.h
index 925a85b..bdb7d42 100644
index 873bbc6afd..606dbb2ab2 100644
--- a/server/security.h
+++ b/server/security.h
@@ -47,6 +47,7 @@ extern const PSID security_local_user_sid;
@@ -128,14 +128,14 @@ index 925a85b..bdb7d42 100644
extern const PSID security_builtin_users_sid;
extern const PSID security_builtin_admins_sid;
+extern const PSID security_domain_users_sid;
extern const PSID security_high_label_sid;
/* token functions */
diff --git a/server/token.c b/server/token.c
index ca12813..d66c39a 100644
index 532d7b7405..1aa1c993df 100644
--- a/server/token.c
+++ b/server/token.c
@@ -91,6 +91,13 @@ static const struct /* same fields as struct SID */
@@ -92,6 +92,13 @@ static const struct /* same fields as struct SID */
SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
DWORD SubAuthority[2];
} builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } };
@@ -149,14 +149,14 @@ index ca12813..d66c39a 100644
const PSID security_world_sid = (PSID)&world_sid;
static const PSID security_local_sid = (PSID)&local_sid;
@@ -100,6 +107,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid;
@@ -101,6 +108,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid;
const PSID security_local_user_sid = (PSID)&local_user_sid;
const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid;
const PSID security_builtin_users_sid = (PSID)&builtin_users_sid;
+const PSID security_domain_users_sid = (PSID)&domain_users_sid;
const PSID security_high_label_sid = (PSID)&high_label_sid;
static luid_t prev_luid_value = { 1000, 0 };
--
2.7.0
2.13.1