The branch, master has been updated via fc6d7bf s4-librpc: Fix private context for dcerpc_connect_timeout_handler via 1547d5f s4-repl: Use ldb_dn_new() to create the rootDSE DN via de0b902 s4-repl: Use NULL for pointer test when checking for ldb_msg_new() failure from 9c9df9c s3-libsmbclient: Add missing talloc_stackframe() calls
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit fc6d7bfbe7511159b8854f5c0174c05f892ee88a Author: Andrew Bartlett <abart...@samba.org> Date: Sun Jul 29 20:37:39 2012 +1000 s4-librpc: Fix private context for dcerpc_connect_timeout_handler This was incorrect in 02a356ea775a3ba589cb50af3c861ab86aaffa0b. Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Sun Jul 29 14:54:33 CEST 2012 on sn-devel-104 commit 1547d5fe003461c99238909d804973fc2659c847 Author: Andrew Bartlett <abart...@samba.org> Date: Sun Jul 29 18:47:24 2012 +1000 s4-repl: Use ldb_dn_new() to create the rootDSE DN Based on a patch proposal by Matthieu Patou <m...@matws.net>. Andrew Bartlett commit de0b902ffaf04d60ef90727d807c9d06a5561d8e Author: Andrew Bartlett <abart...@samba.org> Date: Sun Jul 29 18:46:40 2012 +1000 s4-repl: Use NULL for pointer test when checking for ldb_msg_new() failure ----------------------------------------------------------------------- Summary of changes: source4/dsdb/repl/replicated_objects.c | 8 ++++++-- source4/librpc/rpc/dcerpc_connect.c | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 67999df..dadb9a1 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -654,10 +654,14 @@ WERROR dsdb_replicated_objects_commit(struct ldb_context *ldb, dsdb_make_schema_global(ldb, cur_schema); } msg = ldb_msg_new(ldb); - if (msg == 0) { + if (msg == NULL) { + return WERR_NOMEM; + } + msg->dn = ldb_dn_new(msg, ldb, ""); + if (msg->dn == NULL) { + talloc_free(msg); return WERR_NOMEM; } - msg->dn = NULL; ret = ldb_msg_add_string(msg, "schemaUpdateNow", "1"); if (ret != LDB_SUCCESS) { diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 821499e..280b7ae 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -716,9 +716,9 @@ static void continue_pipe_auth(struct composite_context *ctx) static void dcerpc_connect_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { - struct composite_context *c = talloc_get_type(private_data, + struct composite_context *c = talloc_get_type_abort(private_data, struct composite_context); - struct pipe_connect_state *s = talloc_get_type(c->private_data, struct pipe_connect_state); + struct pipe_connect_state *s = talloc_get_type_abort(c->private_data, struct pipe_connect_state); if (!s->pipe->inhibit_timeout_processing) { composite_error(c, NT_STATUS_IO_TIMEOUT); } else { @@ -766,9 +766,9 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent s->pipe->timed_out = false; s->pipe->inhibit_timeout_processing = false; - tevent_add_timer(c->event_ctx, s, + tevent_add_timer(c->event_ctx, c, timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0), - dcerpc_connect_timeout_handler, s); + dcerpc_connect_timeout_handler, c); switch (s->binding->transport) { case NCA_UNKNOWN: { -- Samba Shared Repository