diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-08-01 10:03:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:08 -0500 |
| commit | ebdfd345483328b54e09fb838b6cea13f31c27d5 (patch) | |
| tree | 9f9d47be968a816192c452bd351cdb7f4fae762a /source3 | |
| parent | a81c8b2a2830f964216da7f77250f77d3bcbf29d (diff) | |
| download | samba-ebdfd345483328b54e09fb838b6cea13f31c27d5.tar.gz samba-ebdfd345483328b54e09fb838b6cea13f31c27d5.tar.bz2 samba-ebdfd345483328b54e09fb838b6cea13f31c27d5.zip | |
r24113: some little fixes to get the correct error message
when using "clustering = yes" and ctdbd isn't running
metze
(This used to be commit c5f020ba1fdefe0422dd466b9c68ff67c74ceddd)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/dbwrap_ctdb.c | 6 | ||||
| -rw-r--r-- | source3/lib/messages_ctdbd.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index fff5ad1d9f..73d8eeffea 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/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/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index dbdc8db3c1..6e9b934a75 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/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; |