From: Pavel Filipenský <pfilipensky@samba.org>
Date: Tue, 2 May 2023 19:59:53 +0000 (+0200)
Subject: s3:winbind: Update winbind to tevent 0.15.0 API
X-Git-Tag: ldb-2.8.0~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1b2f17c6db3286cf991ac2ff9f62632ae0660ac;p=thirdparty%2Fsamba.git

s3:winbind: Update winbind to tevent 0.15.0 API

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index b191e010e19..7db0e87163a 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -441,7 +441,6 @@ static struct tevent_req *process_request_send(
 	if (req == NULL) {
 		return NULL;
 	}
-	tevent_thread_call_depth_start(req);
 	state->cli_state = cli_state;
 	state->ev = ev;
 
@@ -1638,7 +1637,10 @@ int main(int argc, const char **argv)
 
 	if (lp_winbind_debug_traceid()) {
 		winbind_debug_traceid_setup(global_event_context());
-		tevent_thread_call_depth_activate(debug_call_depth_addr());
+		winbind_debug_call_depth_setup(debug_call_depth_addr());
+		tevent_thread_call_depth_set_callback(
+			debuglevel_get() > 1 ? winbind_call_flow : NULL,
+			NULL);
 	}
 	ok = initialize_password_db(true, global_event_context());
 	if (!ok) {
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 9ad4dea28f8..e828e616765 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1746,7 +1746,7 @@ static bool fork_domain_child(struct winbindd_child *child)
 	/* Reset traceid and deactivate call_depth tracking */
 	if (lp_winbind_debug_traceid()) {
 		debug_traceid_set(1);
-		tevent_thread_call_depth_deactivate();
+		tevent_thread_call_depth_set_callback(NULL, NULL);
 	}
 
 	status = winbindd_reinit_after_fork(child, child->logfilename);