summaryrefslogtreecommitdiffstats
path: root/source/lib/dbwrap_ctdb.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-08-01 10:06:04 +0000
committerStefan Metzmacher <metze@samba.org>2007-08-01 10:06:04 +0000
commit0c4d98c8184f5ad8cc4e2fddb51504261992fa8d (patch)
treea188e6aa92cfea3066d32a8b7b59e7a704c07e8b /source/lib/dbwrap_ctdb.c
parenteea6694b182183c178e15ed2371cf674b1b26ae1 (diff)
downloadsamba-0c4d98c8184f5ad8cc4e2fddb51504261992fa8d.tar.gz
samba-0c4d98c8184f5ad8cc4e2fddb51504261992fa8d.tar.xz
samba-0c4d98c8184f5ad8cc4e2fddb51504261992fa8d.zip
r24114: merge from SAMBA_3_2:
some little fixes to get the correct error message when using "clustering = yes" and ctdbd isn't running metze
Diffstat (limited to 'source/lib/dbwrap_ctdb.c')
-rw-r--r--source/lib/dbwrap_ctdb.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/lib/dbwrap_ctdb.c b/source/lib/dbwrap_ctdb.c
index fff5ad1d9fc..73d8eeffea1 100644
--- a/source/lib/dbwrap_ctdb.c
+++ b/source/lib/dbwrap_ctdb.c
@@ -363,7 +363,11 @@ static struct ctdbd_connection *db_ctdbd_conn(struct db_ctdb_ctx *ctx)
}
if (ctx->conn == NULL) {
- ctdbd_init_connection(ctx, &ctx->conn);
+ NTSTATUS status;
+ status = ctdbd_init_connection(ctx, &ctx->conn);
+ if (!NT_STATUS_IS_OK(status)) {
+ return NULL;
+ }
set_my_vnn(ctdbd_vnn(ctx->conn));
}