summaryrefslogtreecommitdiff
path: root/source4/librpc
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/librpc
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/librpc')
-rw-r--r--source4/librpc/rpc/dcerpc.c4
-rw-r--r--source4/librpc/rpc/dcerpc_auth.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index aabc71a258..d8fb3e4e6a 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -722,7 +722,7 @@ struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p,
return c;
failed:
- composite_trigger_error(c);
+ composite_error(c, c->status);
return c;
}
@@ -1633,7 +1633,7 @@ struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p,
return c;
failed:
- composite_trigger_error(c);
+ composite_error(c, c->status);
return c;
}
diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c
index 1dbc3b8aef..dcf3334212 100644
--- a/source4/librpc/rpc/dcerpc_auth.c
+++ b/source4/librpc/rpc/dcerpc_auth.c
@@ -47,7 +47,7 @@ struct composite_context *dcerpc_bind_auth_none_send(TALLOC_CTX *mem_ctx,
if (!NT_STATUS_IS_OK(c->status)) {
DEBUG(2,("Invalid uuid string in "
"dcerpc_bind_auth_none_send\n"));
- composite_trigger_error(c);
+ composite_error(c, c->status);
return c;
}
@@ -277,7 +277,7 @@ struct composite_context *dcerpc_bind_auth_send(TALLOC_CTX *mem_ctx,
NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED);
if (state->credentials.length == 0) {
- composite_trigger_done(c);
+ composite_done(c);
return c;
}
@@ -296,7 +296,7 @@ struct composite_context *dcerpc_bind_auth_send(TALLOC_CTX *mem_ctx,
return c;
failed:
- composite_trigger_error(c);
+ composite_error(c, c->status);
return c;
}