summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-01-31 10:54:48 +0100
committerMichael Adam <obnox@samba.org>2013-10-17 23:19:36 +0200
commitd730a61c1e9f426f4fe9c3c34732c2245b77f0e4 (patch)
treec13fa7d9ca823640a38ae0542a99209207ff8c88
parent2474455b7f924ae19ea8897d5e506076f7e77419 (diff)
downloadsamba-d730a61c1e9f426f4fe9c3c34732c2245b77f0e4.tar.gz
samba-d730a61c1e9f426f4fe9c3c34732c2245b77f0e4.tar.bz2
samba-d730a61c1e9f426f4fe9c3c34732c2245b77f0e4.zip
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 <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/lib/ctdbd_conn.c4
1 files changed, 3 insertions, 1 deletions
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;
}