diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-05-07 19:55:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:43 -0500 |
| commit | 7f0a396e3b4f02aea24d6e6d8d6123c5aa737248 (patch) | |
| tree | 09883421ee80e52bda061bf9bd84b6e1d5f8b9f8 /source4/librpc/rpc/dcerpc_connect.c | |
| parent | e9c7016699c61b4d21341b639bbe4291dcd21872 (diff) | |
| download | samba-7f0a396e3b4f02aea24d6e6d8d6123c5aa737248.tar.gz samba-7f0a396e3b4f02aea24d6e6d8d6123c5aa737248.tar.bz2 samba-7f0a396e3b4f02aea24d6e6d8d6123c5aa737248.zip | |
r15504: Revert -r 15500 and -r 15503 until I'm awake, and can get my head
around the mess that is composite functions...
Async might be all the rage, but it's bloody painful to debug.
Andrew Bartlett
(This used to be commit 756e1dad7ce54b83f8170db3434bfcfc4afe7e65)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_connect.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 66b0af178b..d69db51eb4 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -764,7 +764,7 @@ static void continue_pipe_auth(struct composite_context *ctx) struct composite_context); struct pipe_connect_state *s = talloc_get_type(c->private_data, struct pipe_connect_state); - c->status = dcerpc_pipe_auth_recv(s, &s->pipe); + c->status = dcerpc_pipe_auth_recv(ctx, s, &s->pipe); if (!composite_is_ok(c)) return; composite_done(c); @@ -1170,8 +1170,7 @@ NTSTATUS dcerpc_secondary_connection_recv(struct composite_context *c, s = talloc_get_type(c->private_data, struct sec_conn_state); if (NT_STATUS_IS_OK(status)) { - talloc_steal(s->pipe, s->pipe2); - *p2 = s->pipe2; + *p2 = talloc_steal(s->pipe, s->pipe2); } talloc_free(c); |