git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80b127c
)
Revert "TODO breaks tests libcli/security: fix the CREATOR_OWNER order in calculate_i...
author
Stefan Metzmacher
<metze@samba.org>
Mon, 27 Jun 2016 19:55:47 +0000
(21:55 +0200)
committer
Stefan Metzmacher
<metze@samba.org>
Mon, 27 Jun 2016 19:55:47 +0000
(21:55 +0200)
This reverts commit
80b127c13a0592f8f1569c1cf8f356f292971fd6
.
libcli/security/create_descriptor.c
patch
|
blob
|
history
diff --git
a/libcli/security/create_descriptor.c
b/libcli/security/create_descriptor.c
index 037dd0a776ae703e84452d6f7b3a619d5582a5a2..03c0658485eb1356124a5fffc3d3e0f14ad3b9b4 100644
(file)
--- a/
libcli/security/create_descriptor.c
+++ b/
libcli/security/create_descriptor.c
@@
-215,10
+215,10
@@
static struct security_acl *calculate_inherited_from_parent(TALLOC_CTX *mem_ctx,
return NULL;
}
tmp_acl->aces[tmp_acl->num_aces] = *ace;
- desc_expand_generic(&tmp_acl->aces[tmp_acl->num_aces
-1
],
+ desc_expand_generic(&tmp_acl->aces[tmp_acl->num_aces],
owner,
group);
- tmp_acl->aces[tmp_acl->num_aces
-1
].flags = SEC_ACE_FLAG_INHERITED_ACE;
+ tmp_acl->aces[tmp_acl->num_aces].flags = SEC_ACE_FLAG_INHERITED_ACE;
tmp_acl->num_aces++;
}
}