diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-12-08 01:13:45 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:11 -0500 |
commit | 111a920fdb92ccef32f89b2f992bdd3051e5ac54 (patch) | |
tree | 24adf02842938ad320ad682b133eb76bd1be5cd8 /source4/libcli/smb2 | |
parent | 344703bfc0580419666e14217e6acf9e5f0c86c7 (diff) | |
download | samba-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/libcli/smb2')
-rw-r--r-- | source4/libcli/smb2/connect.c | 2 | ||||
-rw-r--r-- | source4/libcli/smb2/session.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index 7ed3f97bf3..d15f370feb 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -201,7 +201,7 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx, return c; failed: - composite_trigger_error(c); + composite_error(c, c->status); return c; } diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index 07970747c4..208e2a94de 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -253,7 +253,7 @@ struct composite_context *smb2_session_setup_spnego_send(struct smb2_session *se return c; failed: - composite_trigger_error(c); + composite_error(c, c->status); return c; } |