summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-04 03:25:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:02 -0500
commit80ae1c2a2aeace891d24390f2f639a3c3d18739a (patch)
treed2e7a441481dcf641eb1aee5806c65700adc3e91 /source4
parent31df9075c51e119fb9ab80bf2acb3a22645fa377 (diff)
downloadsamba-80ae1c2a2aeace891d24390f2f639a3c3d18739a.tar.gz
samba-80ae1c2a2aeace891d24390f2f639a3c3d18739a.tar.bz2
samba-80ae1c2a2aeace891d24390f2f639a3c3d18739a.zip
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)
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/schema/schema_init.c2
-rw-r--r--source4/smbd/server.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index c7a7b59754..bf82b0b189 100644
--- 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 d44ecff865..9e19453aa6 100644
--- 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);