summaryrefslogtreecommitdiff
path: root/source4/wrepl_server
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/wrepl_server
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/wrepl_server')
-rw-r--r--source4/wrepl_server/wrepl_out_helpers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c
index 36d189a4d0..c7c6f55767 100644
--- a/source4/wrepl_server/wrepl_out_helpers.c
+++ b/source4/wrepl_server/wrepl_out_helpers.c
@@ -156,12 +156,12 @@ static struct composite_context *wreplsrv_out_connect_send(struct wreplsrv_partn
if (!wreplconn->sock->dead) {
state->stage = WREPLSRV_OUT_CONNECT_STAGE_DONE;
state->wreplconn= wreplconn;
- composite_trigger_done(c);
+ composite_done(c);
return c;
} else if (!cached_connection) {
state->stage = WREPLSRV_OUT_CONNECT_STAGE_DONE;
state->wreplconn= NULL;
- composite_trigger_done(c);
+ composite_done(c);
return c;
} else {
talloc_free(wreplconn);
@@ -328,7 +328,7 @@ struct composite_context *wreplsrv_pull_table_send(TALLOC_CTX *mem_ctx, struct w
state->table_io.out.num_partners = io->in.num_owners;
state->table_io.out.partners = io->in.owners;
state->stage = WREPLSRV_PULL_TABLE_STAGE_DONE;
- composite_trigger_done(c);
+ composite_done(c);
return c;
}