diff options
author | Jeremy Allison <jra@samba.org> | 2008-05-30 10:09:22 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2008-05-30 10:09:22 -0700 |
commit | a991c5a7c30253fa36e1ee65fb717d62acf3a806 (patch) | |
tree | f744dcbdef7864a1f5915564bde3e11e133a1ecd /source3/lib/events.c | |
parent | 2e9136e085f9a88741c594b44037b2f86474882f (diff) | |
parent | 3e20aeb18e418a5a1a7821fd8c3f0d0bc5169489 (diff) | |
download | samba-a991c5a7c30253fa36e1ee65fb717d62acf3a806.tar.gz samba-a991c5a7c30253fa36e1ee65fb717d62acf3a806.tar.bz2 samba-a991c5a7c30253fa36e1ee65fb717d62acf3a806.zip |
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
(This used to be commit 3d01248f63d0d476c16236453983ffe759d0b2c2)
Diffstat (limited to 'source3/lib/events.c')
-rw-r--r-- | source3/lib/events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/events.c b/source3/lib/events.c index 9decf213b4..8134a7ac1c 100644 --- a/source3/lib/events.c +++ b/source3/lib/events.c @@ -356,7 +356,7 @@ int event_loop_once(struct event_context *ev) struct event_context *event_context_init(TALLOC_CTX *mem_ctx) { - return TALLOC_ZERO_P(NULL, struct event_context); + return TALLOC_ZERO_P(mem_ctx, struct event_context); } int set_event_dispatch_time(struct event_context *event_ctx, |