diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-08-07 17:14:13 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-08-07 17:24:48 +1000 |
commit | e2d4ae15107c8613707adc68ffc68c6ced04e9be (patch) | |
tree | c782a84ad529555f2b635f4032605dbb1b84393c /source4/libcli/composite | |
parent | 238bf25af44ecc51bef59f1d0b9303da9904432e (diff) | |
download | samba-e2d4ae15107c8613707adc68ffc68c6ced04e9be.tar.gz samba-e2d4ae15107c8613707adc68ffc68c6ced04e9be.tar.bz2 samba-e2d4ae15107c8613707adc68ffc68c6ced04e9be.zip |
fixed several places that unnecessarily take a reference to the event context
These references were triggering the ambiguous talloc_free errors from
the recent talloc changes when the server is run using the 'standard'
process model instead of the 'single' process model. I am aiming to
move the build farm to use the 'standard' process model soon, as part
of an effort to make our test environment better match the real
deployment of Samba4.
The references are not needed as the way that the event context is
used is as the 'top parent', so when the event context is freed then
all of the structures that were taking a reference to the event
context were actually freed as well, thus making the references
redundent.
Diffstat (limited to 'source4/libcli/composite')
-rw-r--r-- | source4/libcli/composite/composite.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c index ab32175d00..7262ebce54 100644 --- a/source4/libcli/composite/composite.c +++ b/source4/libcli/composite/composite.c @@ -42,11 +42,7 @@ _PUBLIC_ struct composite_context *composite_create(TALLOC_CTX *mem_ctx, c = talloc_zero(mem_ctx, struct composite_context); if (!c) return NULL; c->state = COMPOSITE_STATE_IN_PROGRESS; - c->event_ctx = talloc_reference(c, ev); - if (!c->event_ctx) { - talloc_free(c); - return NULL; - } + c->event_ctx = ev; return c; } |