diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-01-21 14:34:48 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-03-24 19:08:44 +0100 |
| commit | 74b359c61686c1a940ec76ad4459fabc403a8715 (patch) | |
| tree | f5db71b9c25ef2e8e75c569b72441a57cd396df0 /source3/lib/dbwrap | |
| parent | e93b85dbd871d5d56a7bc13235820c488a41266f (diff) | |
| download | samba-74b359c61686c1a940ec76ad4459fabc403a8715.tar.gz | |
s3:build: remove global CLUSTER_SUPPORT define
All ctdb specific code is isolated in samba-cluster-support.so now.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Mon Mar 24 19:08:44 CET 2014 on sn-devel-104
Diffstat (limited to 'source3/lib/dbwrap')
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_open.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c index 021ebc3980f..81f20b048d5 100644 --- a/source3/lib/dbwrap/dbwrap_open.c +++ b/source3/lib/dbwrap/dbwrap_open.c @@ -30,7 +30,6 @@ bool db_is_local(const char *name) { -#ifdef CLUSTER_SUPPORT const char *sockname = lp_ctdbd_socket(); if (lp_clustering() && socket_exist(sockname)) { @@ -47,7 +46,7 @@ bool db_is_local(const char *name) return false; } } -#endif + return true; } @@ -62,9 +61,7 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx, uint64_t dbwrap_flags) { struct db_context *result = NULL; -#ifdef CLUSTER_SUPPORT const char *sockname; -#endif if (!DBWRAP_LOCK_ORDER_VALID(lock_order)) { errno = EINVAL; @@ -96,7 +93,6 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx, } } -#ifdef CLUSTER_SUPPORT sockname = lp_ctdbd_socket(); if (lp_clustering()) { @@ -131,8 +127,6 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx, } } -#endif - if (result == NULL) { struct loadparm_context *lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_helpers()); result = dbwrap_local_open(mem_ctx, lp_ctx, name, hash_size, |