[1/7] server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient. (try 3)

[Joris van der Wel]

server: Any of the 4 SE_*_DEFAULTED controls should not be stored on
 objects, their usage is transient.

---
 dlls/advapi32/tests/security.c | 4 ++--
 server/object.c                | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20140626/58180807/attachment.html>
-------------- next part --------------
From 2792ec3144ab18fa4f924e46d686ffa2708abea3 Mon Sep 17 00:00:00 2001
From: Joris van der Wel <joris at jorisvanderwel.com>
Date: Wed, 25 Jun 2014 23:08:47 +0200
Subject: server: Any of the 4 SE_*_DEFAULTED controls should not be stored on
 objects, their usage is transient.

---
 dlls/advapi32/tests/security.c | 4 ++--
 server/object.c                | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 05da0ae..d75354f 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -5341,7 +5341,7 @@ static void test_default_dacl_owner_sid(void)
     ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted );
     ok( ret, "error %u\n", GetLastError() );
     ok( owner != (void *)0xdeadbeef, "owner not set\n" );
-    todo_wine ok( !defaulted, "owner defaulted\n" );
+    ok( !defaulted, "owner defaulted\n" );
 
     dacl = (void *)0xdeadbeef;
     present = FALSE;
@@ -5350,7 +5350,7 @@ static void test_default_dacl_owner_sid(void)
     ok( ret, "error %u\n", GetLastError() );
     ok( present, "dacl not present\n" );
     ok( dacl != (void *)0xdeadbeef, "dacl not set\n" );
-    todo_wine ok( !defaulted, "dacl defaulted\n" );
+    ok( !defaulted, "dacl defaulted\n" );
 
     index = 0;
     found = FALSE;
diff --git a/server/object.c b/server/object.c
index c206747..021c741 100644
--- a/server/object.c
+++ b/server/object.c
@@ -443,7 +443,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
     {
         owner = token_get_user( current->process->token );
         new_sd.owner_len = security_sid_len( owner );
-        new_sd.control |= SE_OWNER_DEFAULTED;
     }
 
     group = sd_get_group( sd );
@@ -453,7 +452,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
     {
         group = token_get_primary_group( current->process->token );
         new_sd.group_len = security_sid_len( group );
-        new_sd.control |= SE_GROUP_DEFAULTED;
     }
 
     new_sd.control |= SE_SACL_PRESENT;
@@ -469,7 +467,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
         else
         {
             new_sd.sacl_len = 0;
-            new_sd.control |= SE_SACL_DEFAULTED;
         }
     }
 
@@ -487,7 +484,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
         {
             dacl = token_get_default_dacl( current->process->token );
             new_sd.dacl_len = dacl->AclSize;
-            new_sd.control |= SE_DACL_DEFAULTED;
         }
     }
 
-- 
1.8.1.msysgit.1