Attachment 14083 Details for Bug 13340 – Patch

[patch] Patch

patch.txt (text/plain), 1.30 KB, created by Volker Lendecke on 2018-03-26 10:20:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2018-03-26 10:20:22 UTC

Size: 1.30 KB

patch

obsolete

>From f4904349554f713f03e82736a7addc566ce63cdc Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 26 Mar 2018 04:36:25 -0500
>Subject: [PATCH] smbd: Fix "reset on zero vc"
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13340
>Signed-off-by: Volker Lendecke <vl@samba.org>
>---
> source3/smbd/sesssetup.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
>index 56318a01deb..91847569fbc 100644
>--- a/source3/smbd/sesssetup.c
>+++ b/source3/smbd/sesssetup.c
>@@ -492,6 +492,7 @@ static int shutdown_other_smbds(struct smbXsrv_session_global0 *session,
> 	struct server_id self_pid = messaging_server_id(state->msg_ctx);
> 	struct server_id pid = session->channels[0].server_id;
> 	const char *addr = session->channels[0].remote_address;
>+	const char *found_addr;
> 	struct server_id_buf tmp;
> 
> 	DEBUG(10, ("shutdown_other_smbds: %s, %s\n",
>@@ -513,7 +514,9 @@ static int shutdown_other_smbds(struct smbXsrv_session_global0 *session,
> 	 * contains a string like:
> 	 * 'ipv4:127.0.0.1:48163'
> 	 */
>-	if (strstr(addr, state->ip)  == NULL) {
>+	found_addr = strstr(addr, state->ip);
>+	if ((found_addr == NULL) ||
>+	    (found_addr[strlen(state->ip)] != ':')) {
> 		DEBUG(10, ("%s does not match %s\n", state->ip, addr));
> 		return 0;
> 	}
>-- 
>2.11.0
>

Actions: View

Attachments on bug 13340: 14057 | 14083 | 14095