diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-11-03 12:37:38 +1100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2015-11-03 12:10:24 +0100 |
| commit | ed1e6463a7809b12b105d03b15da158c3075478c (patch) | |
| tree | db3ef00fdc35c146586e500390c126ffb0006975 /source3 | |
| parent | af92f1b0629acecc31b78bba67e0bb8d707e3606 (diff) | |
| download | samba-ed1e6463a7809b12b105d03b15da158c3075478c.tar.gz | |
smbd: Do not include CTDB headers without CLUSTER_SUPPORT enabled
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/server.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 5fa0885a828..de0bf242d3b 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -48,9 +48,12 @@ #include "lib/smbd_shim.h" #include "scavenger.h" #include "locking/leases_db.h" -#include "../../ctdb/include/ctdb_protocol.h" #include "smbd/notifyd/notifyd.h" +#ifdef CLUSTER_SUPPORT +#include "ctdb_protocol.h" +#endif + struct smbd_open_socket; struct smbd_child_pid; @@ -265,6 +268,7 @@ static void smbd_parent_id_cache_delete(struct messaging_context *ctx, messaging_send_to_children(ctx, msg_type, msg_data); } +#ifdef CLUSTER_SUPPORT static int smbd_parent_ctdb_reconfigured( uint32_t src_vnn, uint32_t dst_vnn, uint64_t dst_srvid, const uint8_t *msg, size_t msglen, void *private_data) @@ -284,6 +288,7 @@ static int smbd_parent_ctdb_reconfigured( return 0; } +#endif static void add_child_pid(struct smbd_parent_context *parent, pid_t pid) @@ -906,6 +911,7 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, messaging_register(msg_ctx, NULL, ID_CACHE_KILL, smbd_parent_id_cache_kill); +#ifdef CLUSTER_SUPPORT if (lp_clustering()) { struct ctdbd_connection *conn = messaging_ctdbd_connection(); @@ -914,6 +920,7 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, register_with_ctdbd(conn, CTDB_SRVID_SAMBA_NOTIFY, smbd_parent_ctdb_reconfigured, msg_ctx); } +#endif #ifdef DEVELOPER messaging_register(msg_ctx, NULL, MSG_SMB_INJECT_FAULT, |