diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-22 10:21:22 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-22 10:21:22 +0200 |
| commit | 38a4f9df170fba0a05755e06dd4362d471b3db80 (patch) | |
| tree | a1f3623e06ce4fd1e010afd5e72062dbee0d9b83 /source4/librpc/rpc/dcerpc_connect.c | |
| parent | 54efc107e58ed1eed7109ea08fdf808e3a15327b (diff) | |
| parent | 7dddab3f6cdb36a537ca3ed9c9f3461993d1c11c (diff) | |
| download | samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.gz samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.bz2 samba-38a4f9df170fba0a05755e06dd4362d471b3db80.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e38de45640430be002053b8bd52b615184134ba)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_connect.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index cc7f2ddbaa..a22cad9a4a 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -717,12 +717,6 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent struct pipe_connect_state *s; struct event_context *new_ev = NULL; - if (ev == NULL) { - new_ev = event_context_init(parent_ctx); - if (new_ev == NULL) return NULL; - ev = new_ev; - } - /* composite context allocation and setup */ c = composite_create(parent_ctx, ev); if (c == NULL) { @@ -844,21 +838,12 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_send(TALLOC_CTX *parent_c struct pipe_conn_state *s; struct dcerpc_binding *b; struct composite_context *pipe_conn_req; - struct event_context *new_ev = NULL; - - if (ev == NULL) { - new_ev = event_context_init(parent_ctx); - if (new_ev == NULL) return NULL; - ev = new_ev; - } /* composite context allocation and setup */ c = composite_create(parent_ctx, ev); if (c == NULL) { - talloc_free(new_ev); return NULL; } - talloc_steal(c, new_ev); s = talloc_zero(c, struct pipe_conn_state); if (composite_nomem(s, c)) return c; |