lib: Move lp_ctdbd_socket() to cluster_support.c

There we have a #ifdef CTDB_SOCKET anyway

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 803d3d42114697575006fbc0fb2a973ac43a77c8..b1c25349331f92c1df57dfdbd052d2876364bef7 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -30,7 +30,6 @@ NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
                                    struct ctdbd_connection **pconn);
 
 uint32_t ctdbd_vnn(const struct ctdbd_connection *conn);
-const char *lp_ctdbd_socket(void);
 
 NTSTATUS ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
                                struct messaging_context *msg_ctx);

diff --git a/source3/lib/cluster_support.c b/source3/lib/cluster_support.c
index b8925aa77258a870e1689d887901a2365ae65984..c11b1f76dbbf0e89b4c3e38b14858507e756ca4c 100644 (file)
--- a/source3/lib/cluster_support.c
+++ b/source3/lib/cluster_support.c
@@ -54,3 +54,19 @@ const char *cluster_support_features(void)
 
        return v;
 }
+
+const char *lp_ctdbd_socket(void)
+{
+       const char *ret;
+
+       ret = lp__ctdbd_socket();
+       if (ret != NULL && strlen(ret) > 0) {
+               return ret;
+       }
+
+#ifdef CTDB_SOCKET
+       return CTDB_SOCKET;
+#else
+       return "";
+#endif
+}

diff --git a/source3/lib/cluster_support.h b/source3/lib/cluster_support.h
index 0a03d2b5614a1c1489e82a03879dc1984f5ec968..5e040bb2d87528bb72026cc572e5585fc49b7966 100644 (file)
--- a/source3/lib/cluster_support.h
+++ b/source3/lib/cluster_support.h
@@ -18,3 +18,4 @@
 
 bool cluster_support_available(void);
 const char *cluster_support_features(void);
+const char *lp_ctdbd_socket(void);

diff --git a/source3/lib/ctdb_dummy.c b/source3/lib/ctdb_dummy.c
index 2d1f6deefb9a8ca68c4f1a0c40f737d5da0d4d5a..4b7d20ea4b45ee854fc644d56a37d58cc727587f 100644 (file)
--- a/source3/lib/ctdb_dummy.c
+++ b/source3/lib/ctdb_dummy.c
@@ -58,11 +58,6 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-const char *lp_ctdbd_socket(void)
-{
-       return "";
-}
-
 bool ctdb_processes_exist(struct ctdbd_connection *conn,
                          const struct server_id *pids, int num_pids,
                          bool *results)

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 1bb9125f69ffbc8e91f5e78defecf9a7a5a51440..9ffd44637e160dd85f2e13382861a55d9d9f1864 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -251,18 +251,6 @@ uint32_t ctdbd_vnn(const struct ctdbd_connection *conn)
        return conn->our_vnn;
 }
 
-const char *lp_ctdbd_socket(void)
-{
-       const char *ret;
-
-       ret = lp__ctdbd_socket();
-       if (ret != NULL && strlen(ret) > 0) {
-               return ret;
-       }
-
-       return CTDB_SOCKET;
-}
-
 /*
  * Get us a ctdb connection
  */

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 75dad427ac127491e409ea71be2c24a4d42c52c4..9852bc7275c209bf8ea91aa0d610be910253d098 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -35,6 +35,7 @@
 #include "dbwrap/dbwrap_ctdb.h"
 #include "g_lock.h"
 #include "messages.h"
+#include "lib/cluster_support.h"
 
 struct db_ctdb_transaction_handle {
        struct db_ctdb_ctx *ctx;

diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index 64f484e70a5510d27717ebb39c3a010989e85ead..59fb3e4e8daf2d0029e9b3f9292573855fb917d4 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -25,6 +25,7 @@
 #include "dbwrap/dbwrap_tdb.h"
 #include "dbwrap/dbwrap_ctdb.h"
 #include "lib/param/param.h"
+#include "lib/cluster_support.h"
 #include "util_tdb.h"
 #include "ctdbd_conn.h"
 

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 294debe94c4657428a1611b19b6f2d90831cbc28..ca85ab8c81a61a6064dcc63a614e194ad107435a 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -23,6 +23,7 @@
 #include "lib/util/iov_buf.h"
 #include "lib/messages_util.h"
 #include "ctdbd_conn.h"
+#include "lib/cluster_support.h"
 
 
 struct messaging_ctdbd_context {

diff --git a/source3/lib/util_cluster.c b/source3/lib/util_cluster.c
index ef79c8b635353f2e8b14aceec67e2d55bd3a28e0..c1633f6976ff5a2c1a87a7596b4d4bff86fa6117 100644 (file)
--- a/source3/lib/util_cluster.c
+++ b/source3/lib/util_cluster.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "ctdbd_conn.h"
 #include "util_cluster.h"
+#include "lib/cluster_support.h"
 
 bool cluster_probe_ok(void)
 {