From 1877155c0c6990af184060020522a17a704e5a21 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 29 Jan 2025 10:02:45 +0100 Subject: [PATCH] s4:dsdb/common: simplify the logic in dsdb_expand_nested_groups() By using (struct auth_SidAttr) {} we make sure struct auth_SidAttr can change without leaving uninitialized memory. Signed-off-by: Stefan Metzmacher Reviewed-by: Jennifer Sutton --- source4/dsdb/common/util_groups.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source4/dsdb/common/util_groups.c b/source4/dsdb/common/util_groups.c index 27a87353469..ac476ef9c22 100644 --- a/source4/dsdb/common/util_groups.c +++ b/source4/dsdb/common/util_groups.c @@ -177,8 +177,10 @@ NTSTATUS dsdb_expand_nested_groups(struct ldb_context *sam_ctx, return NT_STATUS_NO_MEMORY; } - (*res_sids)[*num_res_sids].sid = sid; - (*res_sids)[*num_res_sids].attrs = sid_attrs; + (*res_sids)[*num_res_sids] = (struct auth_SidAttr) { + .sid = sid, + .attrs = sid_attrs, + }; ++(*num_res_sids); } -- 2.47.2