From: Michael Adam <obnox@samba.org>
Date: Mon, 14 Jul 2008 08:43:28 +0000 (+0200)
Subject: dbwrap: when clustering = yes, don't fall back to db_open_tdb in db_open
X-Git-Tag: samba-3.3.0pre1~550^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33188a991f7e2f8dc1b5beed1dde1b7f77403e1a;p=thirdparty%2Fsamba.git

dbwrap: when clustering = yes, don't fall back to db_open_tdb in db_open

Michael
---

diff --git a/source/lib/dbwrap.c b/source/lib/dbwrap.c
index 7fe1631bff0..a686ba6b7c4 100644
--- a/source/lib/dbwrap.c
+++ b/source/lib/dbwrap.c
@@ -60,8 +60,15 @@ struct db_context *db_open(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) {