The branch, master has been updated via a80ea6bf4fe rpc: Fix a typo via a0f03be77fc auth: Add necessary decoration to auth/auth_util.h via 2a926231ab9 rpc: Don't crash if npa_accept fails from 7a413a6dab3 python/samba: ignore encoding errors while reading files
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a80ea6bf4fede6de044f15c608ebb3852defff01 Author: Volker Lendecke <v...@samba.org> Date: Mon Apr 1 21:14:05 2019 +0200 rpc: Fix a typo Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Wed Apr 3 17:53:30 UTC 2019 on sn-devel-144 commit a0f03be77fc9086f33c5605cd3ea23a064988d45 Author: Volker Lendecke <v...@samba.org> Date: Wed Apr 3 12:16:50 2019 +0200 auth: Add necessary decoration to auth/auth_util.h Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 2a926231ab9582a4e0cc778032f2c8575f754a9e Author: Volker Lendecke <v...@samba.org> Date: Tue Apr 2 16:37:39 2019 +0200 rpc: Don't crash if npa_accept fails We can only rely on session_info_transport to be filled correctly upon success of the accept_existing_recv function Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: auth/auth_util.h | 9 +++++++++ libcli/named_pipe_auth/npa_tstream.c | 2 +- source3/rpc_server/rpc_server.c | 5 +++-- 3 files changed, 13 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/auth/auth_util.h b/auth/auth_util.h index 1037cb8361f..0af6ff5ec6c 100644 --- a/auth/auth_util.h +++ b/auth/auth_util.h @@ -18,6 +18,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef __AUTH_AUTH_UTIL_H__ +#define __AUTH_AUTH_UTIL_H__ + +#include "replace.h" +#include <talloc.h> +#include "librpc/gen_ndr/auth.h" + struct auth_session_info *copy_session_info( TALLOC_CTX *mem_ctx, const struct auth_session_info *src); + +#endif diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c index 8e93b8175a7..3ba1c2cbf34 100644 --- a/libcli/named_pipe_auth/npa_tstream.c +++ b/libcli/named_pipe_auth/npa_tstream.c @@ -763,7 +763,7 @@ static void tstream_npa_readv_msg_mode_handler(struct tevent_req *subreq) } /* - * we do not set state->ret here as ret includes the headr size. + * we do not set state->ret here as ret includes the header size. * we set it in tstream_npa_readv_pdu_next_vector() */ diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c index 0230d73abb2..f0870c88174 100644 --- a/source3/rpc_server/rpc_server.c +++ b/source3/rpc_server/rpc_server.c @@ -357,8 +357,6 @@ static void named_pipe_accept_done(struct tevent_req *subreq) &npc->local_server_name, &session_info_transport); - npc->session_info = talloc_move(npc, &session_info_transport->session_info); - TALLOC_FREE(subreq); if (ret != 0) { DEBUG(2, ("Failed to accept named pipe connection! (%s)\n", @@ -367,6 +365,9 @@ static void named_pipe_accept_done(struct tevent_req *subreq) return; } + npc->session_info = talloc_move( + npc, &session_info_transport->session_info); + ret = make_server_pipes_struct(npc, npc->msg_ctx, npc->pipe_name, NCACN_NP, -- Samba Shared Repository