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:
23df7d8
)
Revert "TODO breaks tests libcli/security: fix the CREATOR_OWNER order in calculate_i...
author
Stefan Metzmacher
<metze@samba.org>
Thu, 19 Apr 2018 11:13:41 +0000
(13:13 +0200)
committer
Stefan Metzmacher
<metze@samba.org>
Mon, 18 Feb 2019 10:31:19 +0000
(11:31 +0100)
This reverts commit
810b0506be38d65b6aef63df2236c8d3ff1618ca
.
libcli/security/create_descriptor.c
patch
|
blob
|
history
diff --git
a/libcli/security/create_descriptor.c
b/libcli/security/create_descriptor.c
index c138ae985f40cdf5398607e444f89c71def6b312..ef60d847033fb5aa503298f5e96dd651ff53ac03 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++;
}
}