summaryrefslogtreecommitdiff
path: root/source4/cluster/ctdb/server
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2008-06-14 13:00:53 -0400
committerSimo Sorce <idra@samba.org>2008-06-14 13:00:53 -0400
commit2daf2897d5c70c0efbeba9b827c62700b9a9537c (patch)
treed0236f23f6774f775d2a150361c2f5a9674eaf06 /source4/cluster/ctdb/server
parent929adc9efa5cf985f0585214d30d18521aa1a821 (diff)
downloadsamba-2daf2897d5c70c0efbeba9b827c62700b9a9537c.tar.gz
samba-2daf2897d5c70c0efbeba9b827c62700b9a9537c.tar.bz2
samba-2daf2897d5c70c0efbeba9b827c62700b9a9537c.zip
Use a custom init function for samba4 that sets a samba4
specific debug function. By default do not debug, this is the most appropriate action for a library as we cannot assume what stderr is use for in the main app. The main app is responsible to set ev_debug_stderr if they so desire. (This used to be commit e566a2f308ac6fb4b526a744f7059b565670aea5)
Diffstat (limited to 'source4/cluster/ctdb/server')
-rw-r--r--source4/cluster/ctdb/server/ctdb_daemon.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_recoverd.c2
-rw-r--r--source4/cluster/ctdb/server/ctdbd.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/cluster/ctdb/server/ctdb_daemon.c b/source4/cluster/ctdb/server/ctdb_daemon.c
index 32aa2ba272..f96cd86916 100644
--- a/source4/cluster/ctdb/server/ctdb_daemon.c
+++ b/source4/cluster/ctdb/server/ctdb_daemon.c
@@ -650,7 +650,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
domain_socket_name = talloc_strdup(talloc_autofree_context(), ctdb->daemon.name);
talloc_set_destructor(domain_socket_name, unlink_destructor);
- ctdb->ev = event_context_init(NULL);
+ ctdb->ev = s4_event_context_init(NULL);
/* start frozen, then let the first election sort things out */
if (!ctdb_blocking_freeze(ctdb)) {
diff --git a/source4/cluster/ctdb/server/ctdb_recoverd.c b/source4/cluster/ctdb/server/ctdb_recoverd.c
index 5cb985521d..8ebd357c14 100644
--- a/source4/cluster/ctdb/server/ctdb_recoverd.c
+++ b/source4/cluster/ctdb/server/ctdb_recoverd.c
@@ -1487,7 +1487,7 @@ int ctdb_start_recoverd(struct ctdb_context *ctdb)
/* get a new event context */
talloc_free(ctdb->ev);
- ctdb->ev = event_context_init(ctdb);
+ ctdb->ev = s4_event_context_init(ctdb);
event_add_fd(ctdb->ev, ctdb, fd[0], EVENT_FD_READ|EVENT_FD_AUTOCLOSE,
ctdb_recoverd_parent, &fd[0]);
diff --git a/source4/cluster/ctdb/server/ctdbd.c b/source4/cluster/ctdb/server/ctdbd.c
index 2c4a23b673..9729902f50 100644
--- a/source4/cluster/ctdb/server/ctdbd.c
+++ b/source4/cluster/ctdb/server/ctdbd.c
@@ -141,7 +141,7 @@ int main(int argc, const char *argv[])
block_signal(SIGPIPE);
- ev = event_context_init(NULL);
+ ev = s4_event_context_init(NULL);
ctdb = ctdb_cmdline_init(ev);