summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-12-08 01:13:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:11 -0500
commit111a920fdb92ccef32f89b2f992bdd3051e5ac54 (patch)
tree24adf02842938ad320ad682b133eb76bd1be5cd8 /source4/lib
parent344703bfc0580419666e14217e6acf9e5f0c86c7 (diff)
downloadsamba-111a920fdb92ccef32f89b2f992bdd3051e5ac54.tar.gz
samba-111a920fdb92ccef32f89b2f992bdd3051e5ac54.tar.bz2
samba-111a920fdb92ccef32f89b2f992bdd3051e5ac54.zip
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)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/socket/connect.c2
-rw-r--r--source4/lib/socket/connect_multi.c2
2 files changed, 2 insertions, 2 deletions
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;
}