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:
70157fb
)
Revert "TODO breaks tests libcli/security: fix the CREATOR_OWNER order in calculate_i...
author
Stefan Metzmacher
<metze@samba.org>
Sun, 2 Dec 2012 16:44:47 +0000
(17:44 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Tue, 29 Jan 2013 21:03:19 +0000
(22:03 +0100)
This reverts commit
aa304704813fc80980d4dda2ede72acf33944a4c
.
libcli/security/create_descriptor.c
patch
|
blob
|
history
diff --git
a/libcli/security/create_descriptor.c
b/libcli/security/create_descriptor.c
index aab8fc5fcb92cdda982c89bf20fca6c16296440c..23e7e9ba60b03917259e23eb18937941e6a57fd9 100644
(file)
--- a/
libcli/security/create_descriptor.c
+++ b/
libcli/security/create_descriptor.c
@@
-223,10
+223,10
@@
static struct security_acl *calculate_inherited_from_parent(TALLOC_CTX *mem_ctx,
}
tmp_acl->aces[tmp_acl->num_aces] = *ace;
desc_expand_generic(tmp_ctx,
- &tmp_acl->aces[tmp_acl->num_aces
-1
],
+ &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++;
}
}