[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  8f0c863... s3: fail db_open_ctdb if ctdb is not around
      from  fe5f4d9... s3-printing: cope with missing printers in print migration

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8f0c86373241cb9e308ed4b91b2b51d6e67fd88f
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 6 12:32:30 2010 +0200

    s3: fail db_open_ctdb if ctdb is not around

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/dbwrap_ctdb.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 321a071..ceaadd2 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -1292,6 +1292,11 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
 	db_ctdb->db = result;
 
 	conn = messaging_ctdbd_connection(procid_self());
+	if (conn == NULL) {
+		DEBUG(1, ("Could not connect to ctdb\n"));
+		TALLOC_FREE(result);
+		return NULL;
+	}
 
 	if (!NT_STATUS_IS_OK(ctdbd_db_attach(conn, name, &db_ctdb->db_id, tdb_flags))) {
 		DEBUG(0, ("ctdbd_db_attach failed for %s\n", name));


-- 
Samba Shared Repository