From 111a920fdb92ccef32f89b2f992bdd3051e5ac54 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 8 Dec 2005 01:13:45 +0000 Subject: r12116: got rid of composite_trigger_done() and composite_trigger_error(), and instead make the normal composite_done() and composite_error() functions automatically trigger a delayed callback if the caller has had no opportunity to setup a async callback this removes one of the common mistakes in writing a composite function (This used to be commit f9413ce792ded682e05134b66d433eeec293e6f1) --- source4/lib/socket/connect.c | 2 +- source4/lib/socket/connect_multi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/lib/socket') diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c index 1ab4892128..116a8c67d8 100644 --- a/source4/lib/socket/connect.c +++ b/source4/lib/socket/connect.c @@ -138,7 +138,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock, return result; failed: - composite_trigger_error(result); + composite_error(result, result->status); return result; } diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 3948c1e2a1..258560cec5 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -119,7 +119,7 @@ struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, return result; failed: - composite_trigger_error(result); + composite_error(result, result->status); return result; } -- cgit