summaryrefslogtreecommitdiffstats
path: root/source3/lib/util.c
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2014-09-21 10:29:49 +0200
committerMichael Adam <obnox@samba.org>2014-09-21 20:21:10 +0200
commit9b3960226aa7d5c0ce146325f9e689a7d0c7e4e3 (patch)
tree147afe6cdf78efab5aeceea8404b4e1fc6aa1f2b /source3/lib/util.c
parentb3325c9d1d6c647dcf452b74df4c2e3b0568eb96 (diff)
downloadsamba-9b3960226aa7d5c0ce146325f9e689a7d0c7e4e3.tar.gz
samba-9b3960226aa7d5c0ce146325f9e689a7d0c7e4e3.tar.xz
samba-9b3960226aa7d5c0ce146325f9e689a7d0c7e4e3.zip
s3: reset tracepoint handler in reinit_after fork.
This for instance fixes panics in the scavenger process due to talloc stackframes not freed in order. Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r--source3/lib/util.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index f11d6f153d..7b2afa8073 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -451,8 +451,11 @@ NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
goto done;
}
- if (ev_ctx && tevent_re_initialise(ev_ctx) != 0) {
- smb_panic(__location__ ": Failed to re-initialise event context");
+ if (ev_ctx != NULL) {
+ tevent_set_trace_callback(ev_ctx, NULL, NULL);
+ if (tevent_re_initialise(ev_ctx) != 0) {
+ smb_panic(__location__ ": Failed to re-initialise event context");
+ }
}
if (reinit_after_fork_pipe[0] != -1) {