From 56681032b288ed924b40ab353c632a1fb153759d Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 14 Jul 2008 10:53:06 +0200 Subject: dbwrap: when clustering = yes, don't fall back to db_open_tdb in db_open_trans. Michael (This used to be commit 013d29c70438bfd43bd11cbb13ba707b256f9b18) --- source3/lib/dbwrap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source3/lib/dbwrap.c b/source3/lib/dbwrap.c index a686ba6b7c..6dfe0b3766 100644 --- a/source3/lib/dbwrap.c +++ b/source3/lib/dbwrap.c @@ -127,8 +127,15 @@ struct db_context *db_open_trans(TALLOC_CTX *mem_ctx, sockname = CTDB_PATH; } - if (lp_clustering() && socket_exist(sockname)) { + if (lp_clustering()) { const char *partname; + + if (!socket_exist(sockname)) { + DEBUG(1, ("ctdb socket does not exist - is ctdb not " + "running?\n")); + return NULL; + } + /* ctdb only wants the file part of the name */ partname = strrchr(name, '/'); if (partname) { -- cgit