diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-08-01 10:06:04 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-08-01 10:06:04 +0000 |
| commit | 0c4d98c8184f5ad8cc4e2fddb51504261992fa8d (patch) | |
| tree | a188e6aa92cfea3066d32a8b7b59e7a704c07e8b | |
| parent | eea6694b182183c178e15ed2371cf674b1b26ae1 (diff) | |
| download | samba-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
| -rw-r--r-- | source/lib/dbwrap_ctdb.c | 6 | ||||
| -rw-r--r-- | source/lib/messages_ctdbd.c | 2 |
2 files changed, 6 insertions, 2 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)); } diff --git a/source/lib/messages_ctdbd.c b/source/lib/messages_ctdbd.c index dbdc8db3c1e..6e9b934a757 100644 --- a/source/lib/messages_ctdbd.c +++ b/source/lib/messages_ctdbd.c @@ -88,7 +88,7 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx, status = ctdbd_messaging_connection(ctx, &ctx->conn); if (!NT_STATUS_IS_OK(status)) { - DEBUG(10, ("ctdbd_init_connection failed: %s\n", + DEBUG(10, ("ctdbd_messaging_connection failed: %s\n", nt_errstr(status))); TALLOC_FREE(result); return status; |