From: Andrew Bartlett Date: Sun, 13 Mar 2016 22:09:02 +0000 (+1300) Subject: getncchanges: Use the talloc_stackframe() for tempory memory X-Git-Tag: tdb-1.3.10~1028 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8f32528c7939ed47a52e99cfeb03009251bb9d7;p=thirdparty%2Fsamba.git getncchanges: Use the talloc_stackframe() for tempory memory Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam --- diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index ab57adc48d6..806e31838b7 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -1479,7 +1479,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta /* get RID manager, RID set and server DN (in that order) */ /* This first search will get the RID Manager */ - ret = drsuapi_search_with_extended_dn(b_state->sam_ctx, mem_ctx, + ret = drsuapi_search_with_extended_dn(b_state->sam_ctx, frame, search_res, search_dn, LDB_SCOPE_BASE, collect_objects_attrs, @@ -1588,10 +1588,10 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta return WERR_DS_DRA_INTERNAL_ERROR; } - /* Now extend the original search_res with this answer */ + /* Now extend the original search_res with these answers */ (*search_res)->count = 3; - (*search_res)->msgs = talloc_realloc((*search_res)->msgs, mem_ctx, + (*search_res)->msgs = talloc_realloc(frame, (*search_res)->msgs, struct ldb_message *, (*search_res)->count); if ((*search_res)->msgs == NULL) { @@ -1600,7 +1600,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta } - /* Now extend the original search_res with this answer */ + talloc_steal(mem_ctx, *search_res); (*search_res)->msgs[1] = talloc_steal((*search_res)->msgs, search_res2->msgs[0]); (*search_res)->msgs[2] =