ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Joris van der Wel 2014-06-25 23:08:47 +02:00 committed by Alexandre Julliard
parent 6ea4da4038
commit 11674b2f61
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/advapi32/tests/security.c
View File

@ -5341,7 +5341,7 @@ static void test_default_dacl_owner_sid(void)
ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted ); ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted );
ok( ret, "error %u\n", GetLastError() ); ok( ret, "error %u\n", GetLastError() );
ok( owner != (void *)0xdeadbeef, "owner not set\n" ); ok( owner != (void *)0xdeadbeef, "owner not set\n" );
todo_wine ok( !defaulted, "owner defaulted\n" ); ok( !defaulted, "owner defaulted\n" );
dacl = (void *)0xdeadbeef; dacl = (void *)0xdeadbeef;
present = FALSE; present = FALSE;
@ -5350,7 +5350,7 @@ static void test_default_dacl_owner_sid(void)
ok( ret, "error %u\n", GetLastError() ); ok( ret, "error %u\n", GetLastError() );
ok( present, "dacl not present\n" ); ok( present, "dacl not present\n" );
ok( dacl != (void *)0xdeadbeef, "dacl not set\n" ); ok( dacl != (void *)0xdeadbeef, "dacl not set\n" );
todo_wine ok( !defaulted, "dacl defaulted\n" ); ok( !defaulted, "dacl defaulted\n" );
index = 0; index = 0;
found = FALSE; found = FALSE;

4
server/object.c
View File

@ -443,7 +443,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
{ {
owner = token_get_user( current->process->token ); owner = token_get_user( current->process->token );
new_sd.owner_len = security_sid_len( owner ); new_sd.owner_len = security_sid_len( owner );
new_sd.control |= SE_OWNER_DEFAULTED;
} }
group = sd_get_group( sd ); 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 ); group = token_get_primary_group( current->process->token );
new_sd.group_len = security_sid_len( group ); new_sd.group_len = security_sid_len( group );
new_sd.control |= SE_GROUP_DEFAULTED;
} }
new_sd.control |= SE_SACL_PRESENT; new_sd.control |= SE_SACL_PRESENT;
@ -469,7 +467,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
else else
{ {
new_sd.sacl_len = 0; 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 ); dacl = token_get_default_dacl( current->process->token );
new_sd.dacl_len = dacl->AclSize; new_sd.dacl_len = dacl->AclSize;
new_sd.control |= SE_DACL_DEFAULTED;
} }
} }