From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 13 Jun 2022 09:35:31 +0000 (+0200)
Subject: s3:dbwrap_ctdb: improve the error handling in ctdb_async_ctx_init_internal()
X-Git-Tag: tevent-0.13.0~209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96b77d87639ca3c88df9208861a131f29971df8a;p=thirdparty%2Fsamba.git

s3:dbwrap_ctdb: improve the error handling in ctdb_async_ctx_init_internal()

We should not map any error from ctdbd_init_async_connection() to EIO.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jul  1 18:34:17 UTC 2022 on sn-devel-184
---

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 0907089164a..c0af5729f32 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -99,11 +99,17 @@ static int ctdb_async_ctx_init_internal(TALLOC_CTX *mem_ctx,
 		&ctdb_async_ctx.async_conn);
 	unbecome_root();
 
-	if (ret != 0 || ctdb_async_ctx.async_conn == NULL) {
-		DBG_ERR("ctdbd_init_connection failed\n");
-		return EIO;
+	if (ret != 0) {
+		DBG_ERR("ctdbd_init_async_connection(%s, timeout=%d) "
+			"failed: ret=%d %s\n",
+			lp_ctdbd_socket(),
+			lp_ctdb_timeout(),
+			ret, strerror(ret));
+		return ret;
 	}
 
+	SMB_ASSERT(ctdb_async_ctx.async_conn != NULL);
+
 	ctdb_async_ctx.initialized = true;
 	return 0;
 }