[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  46d52b3 s3:smb2_negprot: set the 'remote_proto' value (bug #9499)
      from  e663d18 smb.conf(5): update list of available protocols (bug #9552)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 46d52b396ffd01c5d8a53b8c13b8c5641fa642ba
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 13 10:44:07 2012 +0100

    s3:smb2_negprot: set the 'remote_proto' value (bug #9499)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 5d721de7fdc250c6cb423c553134dd687590c1a0)
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Fri Jan 11 18:01:07 CET 2013 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/smb2_negprot.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

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) {


-- 
Samba Shared Repository