diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-04-17 15:21:08 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-04-17 15:21:08 +0200 |
| commit | dc74e0fad683cb0ef9ee5996aedadd4c377a0f00 (patch) | |
| tree | e33375abeb4ec70f646e420adfe9221e1bb87a2d /source4/librpc | |
| parent | 11703b298685c9984a6a3c3a64eddb8a1a516b90 (diff) | |
| parent | ef457187b4372f039f84fbb4f6e4f0fcffd67b5b (diff) | |
| download | samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.gz samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.bz2 samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3ab9abf40605a4a6b220faeebaef81546a8d87a0)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 469c83788c..71c6d5f2cc 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -209,32 +209,20 @@ struct composite_context *dcerpc_epm_map_binding_send(TALLOC_CTX *mem_ctx, struct epm_map_binding_state *s; struct composite_context *pipe_connect_req; struct cli_credentials *anon_creds; - struct event_context *new_ev = NULL; NTSTATUS status; struct dcerpc_binding *epmapper_binding; int i; - /* Try to find event context in memory context in case passed - * event_context (argument) was NULL. If there's none, just - * create a new one. - */ if (ev == NULL) { - ev = event_context_find(mem_ctx); - if (ev == NULL) { - new_ev = event_context_init(mem_ctx); - if (new_ev == NULL) return NULL; - ev = new_ev; - } + return NULL; } /* composite context allocation and setup */ c = composite_create(mem_ctx, ev); if (c == NULL) { - talloc_free(new_ev); return NULL; } - talloc_steal(c, new_ev); s = talloc_zero(c, struct epm_map_binding_state); if (composite_nomem(s, c)) return c; @@ -245,7 +233,6 @@ struct composite_context *dcerpc_epm_map_binding_send(TALLOC_CTX *mem_ctx, /* anonymous credentials for rpc connection used to get endpoint mapping */ anon_creds = cli_credentials_init(mem_ctx); - cli_credentials_set_event_context(anon_creds, ev); cli_credentials_set_anonymous(anon_creds); /* |