sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

libcli/security: find SDDL coda for RA and conditional ACEs

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2023-08-24 15:08:13 +12:00 committed by Andrew Bartlett
parent cdd9424e4f
commit 672fc0a1ab
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libcli/security/sddl.c
View File

@ -481,6 +481,7 @@ static bool sddl_decode_ace(TALLOC_CTX *mem_ctx,
size_t len;
size_t count = 0;
char *str = *sddl_copy;
bool has_extra_data = false;
ZERO_STRUCTP(ace);
if (*str != '(') {
@ -488,7 +489,7 @@ static bool sddl_decode_ace(TALLOC_CTX *mem_ctx,
}
str++;
/*
* First we split apart the 6 tokens.
* First we split apart the 6 (or 7) tokens.
*
* 0. ace type
* 1. ace flags
@ -497,6 +498,7 @@ static bool sddl_decode_ace(TALLOC_CTX *mem_ctx,
* 4. inherit guid
* 5. sid
*
* 6/extra_data rare optional extra data
*/
tok[0] = str;
while (*str != '\0') {
@ -507,11 +509,13 @@ static bool sddl_decode_ace(TALLOC_CTX *mem_ctx,
tok[count] = str;
if (count == 6) {
/*
* When we get conditional or resource ACEs,
* this will set a flag and break;
* for now we just...
* this looks like a conditional ACE
* or resource ACE, but we can't say
* for sure until we look at the ACE
* type (tok[0]), after the loop.
*/
return false;
has_extra_data = true;
break;
}
continue;
}
@ -546,6 +550,11 @@ static bool sddl_decode_ace(TALLOC_CTX *mem_ctx,
ace->type = v;
if (has_extra_data) {
DBG_WARNING("ACE has trailing section which is not yet supported");
return false;
}
/* ace flags */
if (!sddl_map_flags(ace_flags, tok[1], &v, NULL, false)) {
return false;