sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

notifyd: Consolidate two #ifdef CLUSTER into one

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2017-07-05 09:34:51 +02:00 committed by Jeremy Allison
parent 939576d968
commit d0a7bccae9
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/smbd/notifyd/notifyd.c
View File

@ -241,18 +241,6 @@ struct tevent_req *notifyd_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
}
tevent_req_set_callback(subreq, notifyd_handler_done, req);
#ifdef CLUSTER_SUPPORT
if (ctdbd_conn != NULL) {
subreq = messaging_handler_send(state, ev, msg_ctx,
MSG_SMB_NOTIFY_DB,
notifyd_got_db, state);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, notifyd_handler_done, req);
}
#endif
names_db = messaging_names_db(msg_ctx);
ret = server_id_db_set_exclusive(names_db, "notify-daemon");
@ -273,6 +261,15 @@ struct tevent_req *notifyd_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
#ifdef CLUSTER_SUPPORT
if (ctdbd_conn != NULL) {
subreq = messaging_handler_send(state, ev, msg_ctx,
MSG_SMB_NOTIFY_DB,
notifyd_got_db, state);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, notifyd_handler_done, req);
state->log = talloc_zero(state, struct messaging_reclog);
if (tevent_req_nomem(state->log, req)) {
return tevent_req_post(req, ev);