diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-08-18 09:16:31 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-08-18 09:16:31 +0930 |
| commit | f93440c4b7febb67e23580a6217ada832fa6318a (patch) | |
| tree | 2c86215a1673329bdb3486e6bcd9bb74f2e1088f /ctdb/server/ctdb_recover.c | |
| parent | 532e4a7077524c699b88d0b7c02984d5920e1c58 (diff) | |
| download | samba-f93440c4b7febb67e23580a6217ada832fa6318a.tar.gz samba-f93440c4b7febb67e23580a6217ada832fa6318a.tar.xz samba-f93440c4b7febb67e23580a6217ada832fa6318a.zip | |
event: Update events to latest Samba version 0.9.8
In Samba this is now called "tevent", and while we use the backwards
compatibility wrappers they don't offer EVENT_FD_AUTOCLOSE: that is now
a separate tevent_fd_set_auto_close() function.
This is based on Samba version 7f29f817fa939ef1bbb740584f09e76e2ecd5b06.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(This used to be ctdb commit 85e5e760cc91eb3157d3a88996ce474491646726)
Diffstat (limited to 'ctdb/server/ctdb_recover.c')
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index 22e48986f4..33a543e06f 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -18,7 +18,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "includes.h" -#include "lib/events/events.h" +#include "lib/tevent/tevent.h" #include "lib/tdb/include/tdb.h" #include "system/time.h" #include "system/network.h" @@ -754,7 +754,7 @@ int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb, ctdb_set_recmode_timeout, state); state->fde = event_add_fd(ctdb->ev, state, state->fd[0], - EVENT_FD_READ|EVENT_FD_AUTOCLOSE, + EVENT_FD_READ, set_recmode_handler, (void *)state); @@ -762,6 +762,7 @@ int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb, talloc_free(state); return -1; } + tevent_fd_set_auto_close(state->fde); state->ctdb = ctdb; state->recmode = recmode; |