From adbab7710d1fc4ca31469982dae0ee51e6b19896 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 1 Feb 2012 17:02:52 +0100 Subject: s3:auth: fix potential gap creation in wbcsids_to_samr_RidWithAttributeArray() Pair-Programmed-With: Michael Adam metze --- source3/auth/server_info.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/auth/server_info.c') diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index 6c2723d699..2f764733c2 100644 --- a/source3/auth/server_info.c +++ b/source3/auth/server_info.c @@ -519,7 +519,7 @@ static NTSTATUS wbcsids_to_samr_RidWithAttributeArray( const struct wbcSidWithAttr *sids, size_t num_sids) { - unsigned int i; + unsigned int i, j = 0; bool ok; groups->rids = talloc_array(mem_ctx, @@ -532,15 +532,16 @@ static NTSTATUS wbcsids_to_samr_RidWithAttributeArray( for (i = 0; i < num_sids; i++) { ok = sid_peek_check_rid(domain_sid, (const struct dom_sid *)&sids[i].sid, - &groups->rids[i].rid); + &groups->rids[j].rid); if (!ok) continue; - groups->rids[i].attributes = SE_GROUP_MANDATORY | + groups->rids[j].attributes = SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED; - groups->count++; + j++; } + groups->count = j; return NT_STATUS_OK; } -- cgit