From: Ralph Boehme <slow@samba.org>
Date: Fri, 7 Aug 2020 10:07:28 +0000 (+0200)
Subject: winbind: directly use dcerpc_binding_handle_is_connected() in reset_connection_on_err... 
X-Git-Tag: talloc-2.3.2~885
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f50987df038846f0052d4c33bb534af9f2c79061;p=thirdparty%2Fsamba.git

winbind: directly use dcerpc_binding_handle_is_connected() in reset_connection_on_error() SAMR code

In the end we should avoid rpccli_is_connected(), rpccli_set_timeout() and the
whole rpc_pipe_client concept.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14457

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Ralph Boehme <slow@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Sat Aug  8 10:59:38 UTC 2020 on sn-devel-184
---

diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index 396e2c97709..5681a760bd1 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -185,6 +185,7 @@ static bool reset_connection_on_error(struct winbindd_domain *domain,
 				      NTSTATUS status)
 {
 	struct winbind_internal_pipes *internal_pipes = NULL;
+	struct dcerpc_binding_handle *b = p->binding_handle;
 
 	internal_pipes = talloc_get_type_abort(
 		domain->private_data, struct winbind_internal_pipes);
@@ -197,7 +198,7 @@ static bool reset_connection_on_error(struct winbindd_domain *domain,
 		return true;
 	}
 
-	if (!rpccli_is_connected(p)) {
+	if (!dcerpc_binding_handle_is_connected(b)) {
 		TALLOC_FREE(internal_pipes);
 		domain->private_data = NULL;
 		return true;