[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-1018-gd29409c

[Andrew Tridgell]

The branch, master has been updated
       via  d29409c1523b9d7ca9b3a7400bd9c94641decc46 (commit)
       via  b3377ef2ea71489749787ba13fba4dba1e9b6c6c (commit)
      from  26b77348414fc99ec0a07cb5376942d722ddf643 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d29409c1523b9d7ca9b3a7400bd9c94641decc46
Merge: b3377ef2ea71489749787ba13fba4dba1e9b6c6c 26b77348414fc99ec0a07cb5376942d722ddf643
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Oct 7 16:21:28 2009 +1100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit b3377ef2ea71489749787ba13fba4dba1e9b6c6c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Oct 7 16:20:16 2009 +1100

    s4-drs: fixed a memory error introduced yesterday
    
    ids is retrurned via _ids, so it needs to be on the passed in mem_ctx

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/repl/replicated_objects.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 9877803..ec5dcd4 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -444,7 +444,7 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
 		}
 	}
 
-	ids = talloc_array(objects,
+	ids = talloc_array(mem_ctx,
 			   struct drsuapi_DsReplicaObjectIdentifier2,
 			   num_objects);
 	if (ids == NULL) {


-- 
Samba Shared Repository