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 f55db7882db25019e1af1a497bd7723d10541989.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-02-05 18:35:11 +01:00
parent 661976a145
commit f6e35db051
6 changed files with 264 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From f06a13e553d543e7b49c805b9292611ab1c68371 Mon Sep 17 00:00:00 2001
From 2380d7451dc978cdab3ebcbeb75272c9147d0f68 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 466100d..ca4a8ad 100644
index 498d19a..c09b097 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -4253,11 +4253,15 @@ static void test_acls(void)
@@ -4303,11 +4303,15 @@ static void test_acls(void)
static void test_GetSecurityInfo(void)
{
@@ -30,7 +30,7 @@ index 466100d..ca4a8ad 100644
ACL_SIZE_INFORMATION acl_size;
PSECURITY_DESCRIPTOR pSD;
ACCESS_ALLOWED_ACE *ace;
@@ -4382,6 +4386,37 @@ static void test_GetSecurityInfo(void)
@@ -4434,6 +4438,37 @@ static void test_GetSecurityInfo(void)
}
LocalFree(pSD);
CloseHandle(obj);
@@ -69,7 +69,7 @@ index 466100d..ca4a8ad 100644
static void test_GetSidSubAuthority(void)
diff --git a/server/process.c b/server/process.c
index 26f8924..1047c25 100644
index d51c884..14e36b0 100644
--- a/server/process.c
+++ b/server/process.c
@@ -62,6 +62,7 @@ static int shutdown_stage; /* current stage in the shutdown process */
@@ -88,8 +88,8 @@ index 26f8924..1047c25 100644
+ process_get_sd, /* get_sd */
default_set_sd, /* set_sd */
no_lookup_name, /* lookup_name */
no_open_file, /* open_file */
@@ -642,6 +643,29 @@ static unsigned int process_map_access( struct object *obj, unsigned int access
no_link_name, /* link_name */
@@ -664,6 +665,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 26f8924..1047c25 100644
{
struct process *process = get_fd_user( fd );
diff --git a/server/security.h b/server/security.h
index 855f2e7..01bf637 100644
index 925a85b..bdb7d42 100644
--- a/server/security.h
+++ b/server/security.h
@@ -47,6 +47,7 @@ extern const PSID security_local_user_sid;
@@ -132,7 +132,7 @@ index 855f2e7..01bf637 100644
/* token functions */
diff --git a/server/token.c b/server/token.c
index cb81eec..914dfba 100644
index ca12813..d66c39a 100644
--- a/server/token.c
+++ b/server/token.c
@@ -91,6 +91,13 @@ static const struct /* same fields as struct SID */
@@ -158,5 +158,5 @@ index cb81eec..914dfba 100644
static luid_t prev_luid_value = { 1000, 0 };
--
2.3.5
2.7.0