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.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.c')
-rw-r--r-- | source4/librpc/rpc/dcerpc.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 5e32f6f5bf..4758189d3b 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -67,22 +67,15 @@ static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, return NULL; } - if (ev == NULL) { - ev = event_context_init(c); - if (ev == NULL) { - talloc_free(c); - return NULL; - } - } - c->iconv_convenience = talloc_reference(c, ic); - c->event_ctx = ev; - - if (!talloc_reference(c, ev)) { + c->event_ctx = talloc_reference(c, ev); + + if (c->event_ctx == NULL) { talloc_free(c); return NULL; } + c->call_id = 1; c->security_state.auth_info = NULL; c->security_state.session_key = dcerpc_generic_session_key; |