sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

libcli/security: simplify sddl_encode_sid()

Browse Source 
We should walk the sid_codes array just once.
This makes further changes easier...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:
Stefan Metzmacher 2022-03-25 14:23:45 +01:00
parent 8f4aced365
commit bd327f7d7a
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libcli/security/sddl.c
View File

@ -556,35 +556,39 @@ failed:
static char *sddl_encode_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
struct sddl_transition_state *state)
{
bool in_domain = dom_sid_in_domain(state->domain_sid, sid);
struct dom_sid_buf buf;
const char *sidstr = dom_sid_str_buf(sid, &buf);
uint32_t rid = 0;
size_t i;
char *sidstr;
sidstr = dom_sid_string(mem_ctx, sid);
if (sidstr == NULL) return NULL;
if (sid->num_auths > 1) {
rid = sid->sub_auths[sid->num_auths-1];
}
/* seen if its a well known sid */
for (i=0;sid_codes[i].sid;i++) {
if (strcmp(sidstr, sid_codes[i].sid) == 0) {
talloc_free(sidstr);
for (i=0;i<ARRAY_SIZE(sid_codes);i++) {
/* seen if its a well known sid */
if (sid_codes[i].sid != NULL) {
int cmp;
cmp = strcmp(sidstr, sid_codes[i].sid);
if (cmp != 0) {
continue;
}
return talloc_strdup(mem_ctx, sid_codes[i].code);
}
if (rid == 0) {
continue;
}
if (in_domain && sid_codes[i].rid == rid) {
return talloc_strdup(mem_ctx, sid_codes[i].code);
}
}
/* or a well known rid in our domain */
if (dom_sid_in_domain(state->domain_sid, sid)) {
uint32_t rid = sid->sub_auths[sid->num_auths-1];
for (;i<ARRAY_SIZE(sid_codes);i++) {
if (rid == sid_codes[i].rid) {
talloc_free(sidstr);
return talloc_strdup(mem_ctx, sid_codes[i].code);
}
}
}
talloc_free(sidstr);
/* TODO: encode well known sids as two letter codes */
return dom_sid_string(mem_ctx, sid);
return talloc_strdup(mem_ctx, sidstr);
}