The branch, v3-6-test has been updated via 034a6ef... s3: fail db_open_ctdb if ctdb is not around from 2616dfe... s3-printing: cope with missing printers in print migration
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 034a6efd04c0b171f12a0ba2485e1751e9ea4f90 Author: Volker Lendecke <v...@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