diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-15 10:02:04 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-15 10:02:04 -0700 |
| commit | efe9f952504a5a3114cada5f0caed315c4bc654d (patch) | |
| tree | 158ae6f521152da00b0bd008aaef2a84e6656259 /lib | |
| parent | 5464ce6df678a6ce3022f4a30fd9553996cefb69 (diff) | |
| parent | 8fa5e567e76d4edb818d4cd88886918470d78ad1 (diff) | |
| download | samba-efe9f952504a5a3114cada5f0caed315c4bc654d.tar.gz samba-efe9f952504a5a3114cada5f0caed315c4bc654d.tar.bz2 samba-efe9f952504a5a3114cada5f0caed315c4bc654d.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/talloc/talloc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 2709741dfc..478767c955 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -1468,6 +1468,9 @@ void talloc_enable_null_tracking(void) { if (null_context == NULL) { null_context = _talloc_named_const(NULL, 0, "null_context"); + if (autofree_context != NULL) { + talloc_reparent(NULL, null_context, autofree_context); + } } } |