s4:auth: let authsam_make_user_info_dc() use helper variables for the rodcsid

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>

diff --git a/source4/auth/sam.c b/source4/auth/sam.c
index bf4cde4f886aae3f29dcb5fe3722f88631e6847d..cd4f6ef715998c6449b56fb3a36b9aedabd3d7c7 100644 (file)
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -673,6 +673,8 @@ _PUBLIC_ NTSTATUS authsam_make_user_info_dc(TALLOC_CTX *mem_ctx,
 
        if ((info->acct_flags & (ACB_PARTIAL_SECRETS_ACCOUNT | ACB_WSTRUST)) ==
            (ACB_PARTIAL_SECRETS_ACCOUNT | ACB_WSTRUST)) {
+               struct dom_sid rodcsid = {};
+
                /* the DOMAIN_RID_ENTERPRISE_READONLY_DCS PAC */
                user_info_dc->sids = talloc_realloc(user_info_dc,
                                                   user_info_dc->sids,
@@ -682,9 +684,11 @@ _PUBLIC_ NTSTATUS authsam_make_user_info_dc(TALLOC_CTX *mem_ctx,
                        TALLOC_FREE(user_info_dc);
                        return NT_STATUS_NO_MEMORY;
                }
-               user_info_dc->sids[user_info_dc->num_sids].sid = *domain_sid;
-               sid_append_rid(&user_info_dc->sids[user_info_dc->num_sids].sid,
-                           DOMAIN_RID_ENTERPRISE_READONLY_DCS);
+
+               rodcsid = *domain_sid;
+               sid_append_rid(&rodcsid, DOMAIN_RID_ENTERPRISE_READONLY_DCS);
+
+               user_info_dc->sids[user_info_dc->num_sids].sid = rodcsid;
                user_info_dc->sids[user_info_dc->num_sids].attrs = SE_GROUP_DEFAULT_FLAGS;
                user_info_dc->num_sids++;
        }