diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-14 10:43:28 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-15 13:55:26 +0200 |
| commit | 32df537a24f8f24a90dd9f159efc5e2bf527e43f (patch) | |
| tree | d6c9b5cfb727743ede736249f7bd3df0c5bd7723 | |
| parent | a3356d6f32d00bd62e836dba050db04040b679ed (diff) | |
| download | samba-32df537a24f8f24a90dd9f159efc5e2bf527e43f.tar.gz samba-32df537a24f8f24a90dd9f159efc5e2bf527e43f.tar.bz2 samba-32df537a24f8f24a90dd9f159efc5e2bf527e43f.zip | |
dbwrap: when clustering = yes, don't fall back to db_open_tdb in db_open
Michael
(This used to be commit 33188a991f7e2f8dc1b5beed1dde1b7f77403e1a)
| -rw-r--r-- | source3/lib/dbwrap.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/lib/dbwrap.c b/source3/lib/dbwrap.c index 7fe1631bff..a686ba6b7c 100644 --- a/source3/lib/dbwrap.c +++ b/source3/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) { |