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/winbind | |
| 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/winbind')
| -rw-r--r-- | source4/winbind/wb_async_helpers.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_sid2domain.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c index 8efd19f96b..f6c61c8c36 100644 --- a/source4/winbind/wb_async_helpers.c +++ b/source4/winbind/wb_async_helpers.c @@ -230,7 +230,7 @@ struct composite_context *wb_get_schannel_creds_send(TALLOC_CTX *mem_ctx, return c; failed: - composite_trigger_error(c); + composite_error(c, c->status); return c; } diff --git a/source4/winbind/wb_sid2domain.c b/source4/winbind/wb_sid2domain.c index 70f8f4c626..2c19ef858f 100644 --- a/source4/winbind/wb_sid2domain.c +++ b/source4/winbind/wb_sid2domain.c @@ -85,7 +85,7 @@ struct composite_context *wb_sid2domain_send(TALLOC_CTX *mem_ctx, state->domain = find_domain_from_sid(service, sid); if (state->domain != NULL) { result->status = NT_STATUS_OK; - composite_trigger_done(result); + composite_done(result); return result; } |