From d730a61c1e9f426f4fe9c3c34732c2245b77f0e4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 31 Jan 2013 10:54:48 +0100 Subject: [PATCH] ctdbd_conn: Lift the cluster_fatal call in get_cluster_vnn We have to report a proper error when ctdbd is not around Signed-off-by: Volker Lendecke Reviewed-by: Michael Adam --- source3/lib/ctdbd_conn.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index f960541c3a..70ce82448b 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -128,7 +128,8 @@ static NTSTATUS get_cluster_vnn(struct ctdbd_connection *conn, uint32_t *vnn) CTDB_CURRENT_NODE, CTDB_CONTROL_GET_PNN, 0, 0, tdb_null, NULL, NULL, &cstatus); if (!NT_STATUS_IS_OK(status)) { - cluster_fatal("ctdbd_control failed\n"); + DEBUG(1, ("ctdbd_control failed: %s\n", nt_errstr(status))); + return status; } *vnn = (uint32_t)cstatus; return status; @@ -529,6 +530,7 @@ static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx, if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("get_cluster_vnn failed: %s\n", nt_errstr(status))); + cluster_fatal("get_cluster_vnn failed"); goto fail; } -- 2.34.1