r23695: By not using the NULL context for these large structures, we don't

falsely report them as leaked.

Andrew Bartlett
(This used to be commit e3eb6c2cf63edf50d93a87f656df3ae5aa6efc00)

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index c7a7b59754e3426c7f762440ee10870080a61976..bf82b0b1891854213618b83b384b4719d3aef4ee 100644 (file)
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -1061,7 +1061,7 @@ void dsdb_make_schema_global(struct ldb_context *ldb)
                return;
        }
 
-       talloc_steal(NULL, schema);
+       talloc_steal(talloc_autofree_context(), schema);
        global_schema = schema;
 }
 

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index d44ecff865d8986f442f395e6dcd616c10218c80..9e19453aa626c07b5259fdf6958d15b122fc7bef 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -285,7 +285,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
        
        /* the event context is the top level structure in smbd. Everything else
           should hang off that */
-       event_ctx = event_context_init(NULL);
+       event_ctx = event_context_init(talloc_autofree_context());
 
        /* initialise clustering if needed */
        cluster_ctdb_init(event_ctx, model);