The branch, master has been updated via c3af7a3 lib: Allow NULL blob for messaging_send() via aca68e5 lib: Avoid a "procid_is_local" call via 05c400e lib: Print own pid in messaging_init from 7c9505e ldb:dlinklist: avoid -Wtautological-compare errors with gcc6
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c3af7a377d5e298074123a621e849ddd29deadbd Author: Volker Lendecke <v...@samba.org> Date: Thu Jun 23 13:24:02 2016 +0200 lib: Allow NULL blob for messaging_send() ... something I've wanted to do for ages :-) Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> Autobuild-User(master): Michael Adam <ob...@samba.org> Autobuild-Date(master): Thu Jul 14 20:50:15 CEST 2016 on sn-devel-144 commit aca68e5dbb9d3d250464af6248f5ca95d837d108 Author: Volker Lendecke <v...@samba.org> Date: Tue Apr 26 16:24:33 2016 +0200 lib: Avoid a "procid_is_local" call Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 05c400e1d8f852b04e5b9e7279fe376f76c63bc4 Author: Volker Lendecke <v...@samba.org> Date: Mon Apr 18 16:40:22 2016 +0200 lib: Print own pid in messaging_init This turned out to be some valuable debugging aid for me Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/lib/messages.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 5d90947..ba97fb5 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -379,6 +379,11 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, register_dmalloc_msgs(ctx); debug_register_msgs(ctx); + { + struct server_id_buf tmp; + DBG_DEBUG("my id: %s\n", server_id_str_buf(ctx->id, &tmp)); + } + return ctx; } @@ -511,10 +516,12 @@ NTSTATUS messaging_send(struct messaging_context *msg_ctx, struct server_id server, uint32_t msg_type, const DATA_BLOB *data) { - struct iovec iov; + struct iovec iov = {0}; - iov.iov_base = data->data; - iov.iov_len = data->length; + if (data != NULL) { + iov.iov_base = data->data; + iov.iov_len = data->length; + }; return messaging_send_iov(msg_ctx, server, msg_type, &iov, 1, NULL, 0); } @@ -545,7 +552,7 @@ int messaging_send_iov_from(struct messaging_context *msg_ctx, return EINVAL; } - if (!procid_is_local(&dst)) { + if (dst.vnn != msg_ctx->id.vnn) { if (num_fds > 0) { return ENOSYS; } -- Samba Shared Repository