diff options
| author | Volker Lendecke <vl@samba.org> | 2016-09-30 06:42:40 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2016-10-05 00:06:23 +0200 |
| commit | 4ce599dcd2f5975df52b4392dc8a8e87b57a3f80 (patch) | |
| tree | e5c1441f2d5afc9b914d78c8e1c3865c92d0d7a2 /source3/lib | |
| parent | 6c21d9977fc1c8b8cb3ffd4922ee7b1597452343 (diff) | |
| download | samba-4ce599dcd2f5975df52b4392dc8a8e87b57a3f80.tar.gz | |
messaging: Avoid a default tevent_fd
Instead, rely on messaging_dgm_ref to always request a tevent_handle.
Signed-off-by: Volker Lendecke <vl@samba.org>
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/messages_dgm.c | 8 | ||||
| -rw-r--r-- | source3/lib/messages_dgm_ref.c | 15 |
2 files changed, 8 insertions, 15 deletions
diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c index 6cfaf5cd9c6..7991d424ca7 100644 --- a/source3/lib/messages_dgm.c +++ b/source3/lib/messages_dgm.c @@ -75,7 +75,6 @@ struct messaging_dgm_context { int lockfile_fd; int sock; - struct tevent_fd *read_fde; struct messaging_dgm_in_msg *in_msgs; void (*recv_cb)(struct tevent_context *ev, @@ -911,12 +910,6 @@ int messaging_dgm_init(struct tevent_context *ev, return ret; } - ctx->read_fde = tevent_add_fd(ctx->ev, ctx, ctx->sock, TEVENT_FD_READ, - messaging_dgm_read_handler, ctx); - if (ctx->read_fde == NULL) { - goto fail_nomem; - } - talloc_set_destructor(ctx, messaging_dgm_context_destructor); ctx->have_dgm_context = &have_dgm_context; @@ -946,7 +939,6 @@ static int messaging_dgm_context_destructor(struct messaging_dgm_context *c) TALLOC_FREE(c->in_msgs); } - TALLOC_FREE(c->read_fde); close(c->sock); if (getpid() == c->pid) { diff --git a/source3/lib/messages_dgm_ref.c b/source3/lib/messages_dgm_ref.c index f582750d5f2..a81e25f377c 100644 --- a/source3/lib/messages_dgm_ref.c +++ b/source3/lib/messages_dgm_ref.c @@ -96,13 +96,14 @@ void *messaging_dgm_ref(TALLOC_CTX *mem_ctx, struct tevent_context *ev, return NULL; } - result->tevent_handle = messaging_dgm_register_tevent_context( - result, ev); - if (result->tevent_handle == NULL) { - TALLOC_FREE(result); - *err = ENOMEM; - return NULL; - } + } + + result->tevent_handle = messaging_dgm_register_tevent_context( + result, ev); + if (result->tevent_handle == NULL) { + TALLOC_FREE(result); + *err = ENOMEM; + return NULL; } DBG_DEBUG("unique = %"PRIu64"\n", *unique); |