diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-10-08 13:33:49 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-03-24 17:09:10 +0100 |
| commit | 24054b5f8b196befb454f48a0da0600afac2c7a1 (patch) | |
| tree | 41bcc1d8f70295d507786c4038cd04ec348d1111 /source3/lib | |
| parent | b2c992162230ac1975dee0d0229ea6be7d8ae9a3 (diff) | |
| download | samba-24054b5f8b196befb454f48a0da0600afac2c7a1.tar.gz samba-24054b5f8b196befb454f48a0da0600afac2c7a1.tar.xz samba-24054b5f8b196befb454f48a0da0600afac2c7a1.zip | |
s3:param: move lp_ctdbd_socket() to ctdbd_conn.c
This allows us to use CTDB_PATH only in ctdbd_conn.c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/ctdb_dummy.c | 5 | ||||
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 12 | ||||
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_open.c | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/source3/lib/ctdb_dummy.c b/source3/lib/ctdb_dummy.c index 9f32d1353c6..e2b7c17e4c6 100644 --- a/source3/lib/ctdb_dummy.c +++ b/source3/lib/ctdb_dummy.c @@ -59,6 +59,11 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, return NT_STATUS_NOT_IMPLEMENTED; } +const char *lp_ctdbd_socket(void) +{ + return ""; +} + bool ctdb_serverids_exist_supported(struct ctdbd_connection *conn) { return false; diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 94d19c744d1..ae4f7bbfba3 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -194,6 +194,18 @@ 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_PATH; +} + /* * Get us a ctdb connection */ diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c index 3c8756b0bce..021ebc3980f 100644 --- a/source3/lib/dbwrap/dbwrap_open.c +++ b/source3/lib/dbwrap/dbwrap_open.c @@ -26,9 +26,7 @@ #include "dbwrap/dbwrap_ctdb.h" #include "lib/param/param.h" #include "util_tdb.h" -#ifdef CLUSTER_SUPPORT -#include "ctdb_private.h" -#endif +#include "ctdbd_conn.h" bool db_is_local(const char *name) { |