Attachment 8400 Details for Bug 9499 – proposed patch cherry-picked from master

[patch] proposed patch cherry-picked from master

0001-s3-smb2_negprot-set-the-remote_proto-value-bug-9499.patch (text/plain), 1.37 KB, created by Björn Baumbach on 2013-01-09 16:19:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2013-01-09 16:19:57 UTC

Size: 1.37 KB

patch

obsolete

>From 9650c069c2f03b5c27919a16813aaf0dff225c9d Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 13 Dec 2012 10:44:07 +0100
>Subject: [PATCH] s3:smb2_negprot: set the 'remote_proto' value (bug #9499)
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 5d721de7fdc250c6cb423c553134dd687590c1a0)
>---
> source3/smbd/smb2_negprot.c |    8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
>diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
>index 11ec2a5..2c1d7a1 100644
>--- a/source3/smbd/smb2_negprot.c
>+++ b/source3/smbd/smb2_negprot.c
>@@ -25,6 +25,8 @@
> #include "../lib/tsocket/tsocket.h"
> #include "../librpc/ndr/libndr.h"
> 
>+extern fstring remote_proto;
>+
> /*
>  * this is the entry point if SMB2 is selected via
>  * the SMB negprot and the given dialect.
>@@ -234,6 +236,12 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
> 		set_remote_arch(RA_VISTA);
> 	}
> 
>+	fstr_sprintf(remote_proto, "SMB%X_%02X",
>+		     (dialect >> 8) & 0xFF, dialect & 0xFF);
>+
>+	reload_services(req->sconn, conn_snum_used, true);
>+	DEBUG(3,("Selected protocol %s\n", remote_proto));
>+
> 	/* negprot_spnego() returns a the server guid in the first 16 bytes */
> 	negprot_spnego_blob = negprot_spnego(req, req->sconn);
> 	if (negprot_spnego_blob.data == NULL) {
>-- 
>1.7.8.6
>

Flags:

metze: review+
vl: review+

Actions: View

Attachments on bug 9499: 8400